<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204402] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204402">204402</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-11 18:33:48 -0700 (Thu, 11 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Make B3 Return opcode work without arguments
https://bugs.webkit.org/show_bug.cgi?id=160787
Patch by Benjamin Poulain <bpoulain@apple.com> on 2016-08-11
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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerh">trunk/Source/JavaScriptCore/assembler/MacroAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3BasicBlockcpp">trunk/Source/JavaScriptCore/b3/B3BasicBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3LowerToAircpp">trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3Validatecpp">trunk/Source/JavaScriptCore/b3/B3Validate.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3Valueh">trunk/Source/JavaScriptCore/b3/B3Value.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirOpcodeopcodes">trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3testb3cpp">trunk/Source/JavaScriptCore/b3/testb3.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (204401 => 204402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-08-12 01:29:52 UTC (rev 204401)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-12 01:33:48 UTC (rev 204402)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-08-11 Benjamin Poulain <bpoulain@apple.com>
+
+ [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):
+
</ins><span class="cx"> 2016-08-11 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Gardening: fix gcc builds after r204387.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssembler.h (204401 => 204402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssembler.h 2016-08-12 01:29:52 UTC (rev 204401)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssembler.h 2016-08-12 01:33:48 UTC (rev 204402)
</span><span class="lines">@@ -492,6 +492,7 @@
</span><span class="cx">
</span><span class="cx"> // B3 has additional pseudo-opcodes for returning, when it wants to signal that the return
</span><span class="cx"> // consumes some register in some way.
</span><ins>+ void retVoid() { ret(); }
</ins><span class="cx"> void ret32(RegisterID) { ret(); }
</span><span class="cx"> void ret64(RegisterID) { ret(); }
</span><span class="cx"> void retFloat(FPRegisterID) { ret(); }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3BasicBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3BasicBlock.cpp (204401 => 204402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3BasicBlock.cpp 2016-08-12 01:29:52 UTC (rev 204401)
+++ trunk/Source/JavaScriptCore/b3/B3BasicBlock.cpp 2016-08-12 01:33:48 UTC (rev 204402)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx">
</span><span class="cx"> Value* BasicBlock::appendNewControlValue(Procedure& proc, Opcode opcode, Origin origin)
</span><span class="cx"> {
</span><del>- RELEASE_ASSERT(opcode == Oops);
</del><ins>+ RELEASE_ASSERT(opcode == Oops || opcode == Return);
</ins><span class="cx"> clearSuccessors();
</span><span class="cx"> return appendNew<Value>(proc, opcode, origin);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LowerToAircpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp (204401 => 204402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2016-08-12 01:29:52 UTC (rev 204401)
+++ trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2016-08-12 01:33:48 UTC (rev 204402)
</span><span class="lines">@@ -2431,6 +2431,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case Return: {
</span><ins>+ if (!m_value->numChildren()) {
+ append(RetVoid);
+ return;
+ }
</ins><span class="cx"> Value* value = m_value->child(0);
</span><span class="cx"> Tmp returnValueGPR = Tmp(GPRInfo::returnValueGPR);
</span><span class="cx"> Tmp returnValueFPR = Tmp(FPRInfo::returnValueFPR);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3Validatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3Validate.cpp (204401 => 204402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3Validate.cpp 2016-08-12 01:29:52 UTC (rev 204401)
+++ trunk/Source/JavaScriptCore/b3/B3Validate.cpp 2016-08-12 01:33:48 UTC (rev 204402)
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx"> VALIDATE(!valueOwner.get(value)->numSuccessors(), ("At ", *value));
</span><span class="cx"> break;
</span><span class="cx"> case Return:
</span><del>- VALIDATE(value->numChildren() == 1, ("At ", *value));
</del><ins>+ VALIDATE(value->numChildren() <= 1, ("At ", *value));
</ins><span class="cx"> VALIDATE(value->type() == Void, ("At ", *value));
</span><span class="cx"> VALIDATE(!valueOwner.get(value)->numSuccessors(), ("At ", *value));
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3Valueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3Value.h (204401 => 204402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3Value.h 2016-08-12 01:29:52 UTC (rev 204401)
+++ trunk/Source/JavaScriptCore/b3/B3Value.h 2016-08-12 01:33:48 UTC (rev 204402)
</span><span class="lines">@@ -287,6 +287,10 @@
</span><span class="cx"> if (UNLIKELY(numArgs))
</span><span class="cx"> badOpcode(opcode, numArgs);
</span><span class="cx"> break;
</span><ins>+ case Return:
+ if (UNLIKELY(numArgs > 1))
+ badOpcode(opcode, numArgs);
+ break;
</ins><span class="cx"> case Identity:
</span><span class="cx"> case Neg:
</span><span class="cx"> case Clz:
</span><span class="lines">@@ -305,7 +309,6 @@
</span><span class="cx"> case IToF:
</span><span class="cx"> case BitwiseCast:
</span><span class="cx"> case Branch:
</span><del>- case Return:
</del><span class="cx"> if (UNLIKELY(numArgs != 1))
</span><span class="cx"> badOpcode(opcode, numArgs);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirOpcodeopcodes"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes (204401 => 204402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2016-08-12 01:29:52 UTC (rev 204401)
+++ trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2016-08-12 01:33:48 UTC (rev 204402)
</span><span class="lines">@@ -836,6 +836,8 @@
</span><span class="cx">
</span><span class="cx"> Jump /branch
</span><span class="cx">
</span><ins>+RetVoid /return
+
</ins><span class="cx"> Ret32 U:G:32 /return
</span><span class="cx"> Tmp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (204401 => 204402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp 2016-08-12 01:29:52 UTC (rev 204401)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp 2016-08-12 01:33:48 UTC (rev 204402)
</span><span class="lines">@@ -351,6 +351,14 @@
</span><span class="cx"> CHECK(compileAndRun<int64_t>(proc) == value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testReturnVoid()
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ root->appendNewControlValue(proc, Return, Origin());
+ compileAndRun<void>(proc);
+}
+
</ins><span class="cx"> void testAddArg(int a)
</span><span class="cx"> {
</span><span class="cx"> Procedure proc;
</span><span class="lines">@@ -12944,6 +12952,7 @@
</span><span class="cx"> RUN(testArg(43));
</span><span class="cx"> RUN(testReturnConst64(5));
</span><span class="cx"> RUN(testReturnConst64(-42));
</span><ins>+ RUN(testReturnVoid());
</ins><span class="cx">
</span><span class="cx"> RUN(testAddArg(111));
</span><span class="cx"> RUN(testAddArgs(1, 1));
</span></span></pre>
</div>
</div>
</body>
</html>