Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (204401 => 204402)
--- trunk/Source/_javascript_Core/ChangeLog 2016-08-12 01:29:52 UTC (rev 204401)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-08-12 01:33:48 UTC (rev 204402)
@@ -1,3 +1,25 @@
+2016-08-11 Benjamin Poulain <[email protected]>
+
+ [JSC] Make B3 Return opcode work without arguments
+ https://bugs.webkit.org/show_bug.cgi?id=160787
+
+ Reviewed by Keith Miller.
+
+ We need a way to create functions that do not return values.
+
+ * assembler/MacroAssembler.h:
+ (JSC::MacroAssembler::retVoid):
+ * b3/B3BasicBlock.cpp:
+ (JSC::B3::BasicBlock::appendNewControlValue):
+ * b3/B3LowerToAir.cpp:
+ (JSC::B3::Air::LowerToAir::lower):
+ * b3/B3Validate.cpp:
+ * b3/B3Value.h:
+ * b3/air/AirOpcode.opcodes:
+ * b3/testb3.cpp:
+ (JSC::B3::testReturnVoid):
+ (JSC::B3::run):
+
2016-08-11 Mark Lam <[email protected]>
Gardening: fix gcc builds after r204387.
Modified: trunk/Source/_javascript_Core/assembler/MacroAssembler.h (204401 => 204402)
--- trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2016-08-12 01:29:52 UTC (rev 204401)
+++ trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2016-08-12 01:33:48 UTC (rev 204402)
@@ -492,6 +492,7 @@
// B3 has additional pseudo-opcodes for returning, when it wants to signal that the return
// consumes some register in some way.
+ void retVoid() { ret(); }
void ret32(RegisterID) { ret(); }
void ret64(RegisterID) { ret(); }
void retFloat(FPRegisterID) { ret(); }
Modified: trunk/Source/_javascript_Core/b3/B3BasicBlock.cpp (204401 => 204402)
--- trunk/Source/_javascript_Core/b3/B3BasicBlock.cpp 2016-08-12 01:29:52 UTC (rev 204401)
+++ trunk/Source/_javascript_Core/b3/B3BasicBlock.cpp 2016-08-12 01:33:48 UTC (rev 204402)
@@ -166,7 +166,7 @@
Value* BasicBlock::appendNewControlValue(Procedure& proc, Opcode opcode, Origin origin)
{
- RELEASE_ASSERT(opcode == Oops);
+ RELEASE_ASSERT(opcode == Oops || opcode == Return);
clearSuccessors();
return appendNew<Value>(proc, opcode, origin);
}
Modified: trunk/Source/_javascript_Core/b3/B3LowerToAir.cpp (204401 => 204402)
--- trunk/Source/_javascript_Core/b3/B3LowerToAir.cpp 2016-08-12 01:29:52 UTC (rev 204401)
+++ trunk/Source/_javascript_Core/b3/B3LowerToAir.cpp 2016-08-12 01:33:48 UTC (rev 204402)
@@ -2431,6 +2431,10 @@
}
case Return: {
+ if (!m_value->numChildren()) {
+ append(RetVoid);
+ return;
+ }
Value* value = m_value->child(0);
Tmp returnValueGPR = Tmp(GPRInfo::returnValueGPR);
Tmp returnValueFPR = Tmp(FPRInfo::returnValueFPR);
Modified: trunk/Source/_javascript_Core/b3/B3Validate.cpp (204401 => 204402)
--- trunk/Source/_javascript_Core/b3/B3Validate.cpp 2016-08-12 01:29:52 UTC (rev 204401)
+++ trunk/Source/_javascript_Core/b3/B3Validate.cpp 2016-08-12 01:33:48 UTC (rev 204402)
@@ -388,7 +388,7 @@
VALIDATE(!valueOwner.get(value)->numSuccessors(), ("At ", *value));
break;
case Return:
- VALIDATE(value->numChildren() == 1, ("At ", *value));
+ VALIDATE(value->numChildren() <= 1, ("At ", *value));
VALIDATE(value->type() == Void, ("At ", *value));
VALIDATE(!valueOwner.get(value)->numSuccessors(), ("At ", *value));
break;
Modified: trunk/Source/_javascript_Core/b3/B3Value.h (204401 => 204402)
--- trunk/Source/_javascript_Core/b3/B3Value.h 2016-08-12 01:29:52 UTC (rev 204401)
+++ trunk/Source/_javascript_Core/b3/B3Value.h 2016-08-12 01:33:48 UTC (rev 204402)
@@ -287,6 +287,10 @@
if (UNLIKELY(numArgs))
badOpcode(opcode, numArgs);
break;
+ case Return:
+ if (UNLIKELY(numArgs > 1))
+ badOpcode(opcode, numArgs);
+ break;
case Identity:
case Neg:
case Clz:
@@ -305,7 +309,6 @@
case IToF:
case BitwiseCast:
case Branch:
- case Return:
if (UNLIKELY(numArgs != 1))
badOpcode(opcode, numArgs);
break;
Modified: trunk/Source/_javascript_Core/b3/air/AirOpcode.opcodes (204401 => 204402)
--- trunk/Source/_javascript_Core/b3/air/AirOpcode.opcodes 2016-08-12 01:29:52 UTC (rev 204401)
+++ trunk/Source/_javascript_Core/b3/air/AirOpcode.opcodes 2016-08-12 01:33:48 UTC (rev 204402)
@@ -836,6 +836,8 @@
Jump /branch
+RetVoid /return
+
Ret32 U:G:32 /return
Tmp
Modified: trunk/Source/_javascript_Core/b3/testb3.cpp (204401 => 204402)
--- trunk/Source/_javascript_Core/b3/testb3.cpp 2016-08-12 01:29:52 UTC (rev 204401)
+++ trunk/Source/_javascript_Core/b3/testb3.cpp 2016-08-12 01:33:48 UTC (rev 204402)
@@ -351,6 +351,14 @@
CHECK(compileAndRun<int64_t>(proc) == value);
}
+void testReturnVoid()
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ root->appendNewControlValue(proc, Return, Origin());
+ compileAndRun<void>(proc);
+}
+
void testAddArg(int a)
{
Procedure proc;
@@ -12944,6 +12952,7 @@
RUN(testArg(43));
RUN(testReturnConst64(5));
RUN(testReturnConst64(-42));
+ RUN(testReturnVoid());
RUN(testAddArg(111));
RUN(testAddArgs(1, 1));
