<!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>[160821] branches/jsCStack/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/160821">160821</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2013-12-18 19:48:08 -0800 (Wed, 18 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>CStack: Fix baseline to DFG JIT OSR.
https://bugs.webkit.org/show_bug.cgi?id=125969.
Reviewed by Filip Pizlo.
1. Change operationOptimize() to return a tuple of OSR target address
and new topOfFrame value (as opposed to just the OSR target address).
2. Change emitEnterOptimizationCheck() and emitSlow_op_loop_hint() to
emit code to set the stackPointer with the returned topOfFrame value
if we take the OSR path.
* jit/JIT.cpp:
(JSC::JIT::emitEnterOptimizationCheck):
* jit/JIT.h:
* jit/JITInlines.h:
(JSC::JIT::callOperation):
* jit/JITOpcodes.cpp:
(JSC::JIT::emitSlow_op_loop_hint):
* jit/JITOperations.cpp:
* jit/JITOperations.h:
* runtime/Options.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitJITcpp">branches/jsCStack/Source/JavaScriptCore/jit/JIT.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitJITh">branches/jsCStack/Source/JavaScriptCore/jit/JIT.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitJITInlinesh">branches/jsCStack/Source/JavaScriptCore/jit/JITInlines.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitJITOpcodescpp">branches/jsCStack/Source/JavaScriptCore/jit/JITOpcodes.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitJITOperationscpp">branches/jsCStack/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitJITOperationsh">branches/jsCStack/Source/JavaScriptCore/jit/JITOperations.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreruntimeOptionsh">branches/jsCStack/Source/JavaScriptCore/runtime/Options.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (160820 => 160821)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-19 03:13:18 UTC (rev 160820)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-19 03:48:08 UTC (rev 160821)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2013-12-18 Mark Lam <mark.lam@apple.com>
+
+ CStack: Fix baseline to DFG JIT OSR.
+ https://bugs.webkit.org/show_bug.cgi?id=125969.
+
+ Reviewed by Filip Pizlo.
+
+ 1. Change operationOptimize() to return a tuple of OSR target address
+ and new topOfFrame value (as opposed to just the OSR target address).
+ 2. Change emitEnterOptimizationCheck() and emitSlow_op_loop_hint() to
+ emit code to set the stackPointer with the returned topOfFrame value
+ if we take the OSR path.
+
+ * jit/JIT.cpp:
+ (JSC::JIT::emitEnterOptimizationCheck):
+ * jit/JIT.h:
+ * jit/JITInlines.h:
+ (JSC::JIT::callOperation):
+ * jit/JITOpcodes.cpp:
+ (JSC::JIT::emitSlow_op_loop_hint):
+ * jit/JITOperations.cpp:
+ * jit/JITOperations.h:
+ * runtime/Options.h:
+
</ins><span class="cx"> 2013-12-18 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> CStack Branch: Stop threading callFrameRegister through LLIntSlowCalls
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitJITcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/JIT.cpp (160820 => 160821)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/JIT.cpp 2013-12-19 03:13:18 UTC (rev 160820)
+++ branches/jsCStack/Source/JavaScriptCore/jit/JIT.cpp 2013-12-19 03:48:08 UTC (rev 160821)
</span><span class="lines">@@ -102,6 +102,7 @@
</span><span class="cx"> ASSERT(!m_bytecodeOffset);
</span><span class="cx"> callOperation(operationOptimize, m_bytecodeOffset);
</span><span class="cx"> skipOptimize.append(branchTestPtr(Zero, returnValueGPR));
</span><ins>+ move(returnValueGPR2, stackPointerRegister);
</ins><span class="cx"> jump(returnValueGPR);
</span><span class="cx"> skipOptimize.link(this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitJITh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/JIT.h (160820 => 160821)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/JIT.h 2013-12-19 03:13:18 UTC (rev 160820)
+++ branches/jsCStack/Source/JavaScriptCore/jit/JIT.h 2013-12-19 03:48:08 UTC (rev 160821)
</span><span class="lines">@@ -690,11 +690,11 @@
</span><span class="cx"> MacroAssembler::Call callOperation(WithProfileTag, J_JITOperation_EPc, int, Instruction*);
</span><span class="cx"> MacroAssembler::Call callOperation(J_JITOperation_EZ, int, int32_t);
</span><span class="cx"> MacroAssembler::Call callOperation(P_JITOperation_EJS, GPRReg, size_t);
</span><del>- MacroAssembler::Call callOperation(P_JITOperation_EZ, int32_t);
</del><span class="cx"> MacroAssembler::Call callOperation(S_JITOperation_ECC, RegisterID, RegisterID);
</span><span class="cx"> MacroAssembler::Call callOperation(S_JITOperation_EJ, RegisterID);
</span><span class="cx"> MacroAssembler::Call callOperation(S_JITOperation_EJJ, RegisterID, RegisterID);
</span><span class="cx"> MacroAssembler::Call callOperation(S_JITOperation_EOJss, RegisterID, RegisterID);
</span><ins>+ MacroAssembler::Call callOperation(Sprt_JITOperation_EZ, int32_t);
</ins><span class="cx"> MacroAssembler::Call callOperation(V_JITOperation_E);
</span><span class="cx"> MacroAssembler::Call callOperation(V_JITOperation_EC, RegisterID);
</span><span class="cx"> MacroAssembler::Call callOperation(V_JITOperation_ECC, RegisterID, RegisterID);
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitJITInlinesh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/JITInlines.h (160820 => 160821)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/JITInlines.h 2013-12-19 03:13:18 UTC (rev 160820)
+++ branches/jsCStack/Source/JavaScriptCore/jit/JITInlines.h 2013-12-19 03:48:08 UTC (rev 160821)
</span><span class="lines">@@ -217,21 +217,21 @@
</span><span class="cx"> return appendCallWithExceptionCheckSetJSValueResult(operation, dst);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(P_JITOperation_EZ operation, int32_t op)
</del><ins>+ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(S_JITOperation_ECC operation, RegisterID regOp1, RegisterID regOp2)
</ins><span class="cx"> {
</span><del>- setupArgumentsWithExecState(TrustedImm32(op));
</del><ins>+ setupArgumentsWithExecState(regOp1, regOp2);
</ins><span class="cx"> return appendCallWithExceptionCheck(operation);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(S_JITOperation_ECC operation, RegisterID regOp1, RegisterID regOp2)
</del><ins>+ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(S_JITOperation_EOJss operation, RegisterID regOp1, RegisterID regOp2)
</ins><span class="cx"> {
</span><span class="cx"> setupArgumentsWithExecState(regOp1, regOp2);
</span><span class="cx"> return appendCallWithExceptionCheck(operation);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(S_JITOperation_EOJss operation, RegisterID regOp1, RegisterID regOp2)
</del><ins>+ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(Sprt_JITOperation_EZ operation, int32_t op)
</ins><span class="cx"> {
</span><del>- setupArgumentsWithExecState(regOp1, regOp2);
</del><ins>+ setupArgumentsWithExecState(TrustedImm32(op));
</ins><span class="cx"> return appendCallWithExceptionCheck(operation);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitJITOpcodescpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/JITOpcodes.cpp (160820 => 160821)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/JITOpcodes.cpp 2013-12-19 03:13:18 UTC (rev 160820)
+++ branches/jsCStack/Source/JavaScriptCore/jit/JITOpcodes.cpp 2013-12-19 03:48:08 UTC (rev 160821)
</span><span class="lines">@@ -1116,6 +1116,7 @@
</span><span class="cx">
</span><span class="cx"> callOperation(operationOptimize, m_bytecodeOffset);
</span><span class="cx"> Jump noOptimizedEntry = branchTestPtr(Zero, returnValueGPR);
</span><ins>+ move(returnValueGPR2, stackPointerRegister);
</ins><span class="cx"> jump(returnValueGPR);
</span><span class="cx"> noOptimizedEntry.link(this);
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/JITOperations.cpp (160820 => 160821)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/JITOperations.cpp 2013-12-19 03:13:18 UTC (rev 160820)
+++ branches/jsCStack/Source/JavaScriptCore/jit/JITOperations.cpp 2013-12-19 03:48:08 UTC (rev 160821)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "Arguments.h"
</span><span class="cx"> #include "ArrayConstructor.h"
</span><span class="cx"> #include "CallFrameInlines.h"
</span><del>-#include "CommonSlowPaths.h"
</del><span class="cx"> #include "DFGCompilationMode.h"
</span><span class="cx"> #include "DFGDriver.h"
</span><span class="cx"> #include "DFGOSREntry.h"
</span><span class="lines">@@ -974,7 +973,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><del>-char* JIT_OPERATION operationOptimize(ExecState* exec, int32_t bytecodeIndex)
</del><ins>+SlowPathReturnType JIT_OPERATION operationOptimize(ExecState* exec, int32_t bytecodeIndex)
</ins><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><span class="lines">@@ -1024,7 +1023,7 @@
</span><span class="cx"> codeBlock->updateAllPredictions();
</span><span class="cx"> if (Options::verboseOSR())
</span><span class="cx"> dataLog("Choosing not to optimize ", *codeBlock, " yet, because the threshold hasn't been reached.\n");
</span><del>- return 0;
</del><ins>+ return encodeResult(0, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (codeBlock->m_shouldAlwaysBeInlined) {
</span><span class="lines">@@ -1032,7 +1031,7 @@
</span><span class="cx"> codeBlock->optimizeAfterWarmUp();
</span><span class="cx"> if (Options::verboseOSR())
</span><span class="cx"> dataLog("Choosing not to optimize ", *codeBlock, " yet, because m_shouldAlwaysBeInlined == true.\n");
</span><del>- return 0;
</del><ins>+ return encodeResult(0, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // We cannot be in the process of asynchronous compilation and also have an optimized
</span><span class="lines">@@ -1072,7 +1071,7 @@
</span><span class="cx"> // replacement.
</span><span class="cx"> RELEASE_ASSERT(!codeBlock->hasOptimizedReplacement());
</span><span class="cx"> codeBlock->setOptimizationThresholdBasedOnCompilationResult(CompilationDeferred);
</span><del>- return 0;
</del><ins>+ return encodeResult(0, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (worklistState == DFG::Worklist::Compiled) {
</span><span class="lines">@@ -1085,7 +1084,7 @@
</span><span class="cx"> codeBlock->updateAllPredictions();
</span><span class="cx"> if (Options::verboseOSR())
</span><span class="cx"> dataLog("Code block ", *codeBlock, " was compiled but it doesn't have an optimized replacement.\n");
</span><del>- return 0;
</del><ins>+ return encodeResult(0, 0);
</ins><span class="cx"> }
</span><span class="cx"> } else if (codeBlock->hasOptimizedReplacement()) {
</span><span class="cx"> if (Options::verboseOSR())
</span><span class="lines">@@ -1110,7 +1109,7 @@
</span><span class="cx"> "(", *codeBlock->replacement(), ") (in loop).\n");
</span><span class="cx"> }
</span><span class="cx"> codeBlock->replacement()->jettison(CountReoptimization);
</span><del>- return 0;
</del><ins>+ return encodeResult(0, 0);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if (!codeBlock->shouldOptimizeNow()) {
</span><span class="lines">@@ -1119,7 +1118,7 @@
</span><span class="cx"> "Delaying optimization for ", *codeBlock,
</span><span class="cx"> " because of insufficient profiling.\n");
</span><span class="cx"> }
</span><del>- return 0;
</del><ins>+ return encodeResult(0, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (Options::verboseOSR())
</span><span class="lines">@@ -1152,7 +1151,7 @@
</span><span class="cx"> vm.ensureWorklist());
</span><span class="cx">
</span><span class="cx"> if (result != CompilationSuccessful)
</span><del>- return 0;
</del><ins>+ return encodeResult(0, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CodeBlock* optimizedCodeBlock = codeBlock->replacement();
</span><span class="lines">@@ -1166,7 +1165,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> codeBlock->optimizeSoon();
</span><del>- return static_cast<char*>(address);
</del><ins>+ ASSERT(exec->codeBlock() == optimizedCodeBlock);
+ return encodeResult(address, exec->topOfFrame());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (Options::verboseOSR()) {
</span><span class="lines">@@ -1195,14 +1195,14 @@
</span><span class="cx"> *codeBlock->replacement(), " (after OSR fail).\n");
</span><span class="cx"> }
</span><span class="cx"> optimizedCodeBlock->jettison(CountReoptimization);
</span><del>- return 0;
</del><ins>+ return encodeResult(0, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // OSR failed this time, but it might succeed next time! Let the code run a bit
</span><span class="cx"> // longer and then try again.
</span><span class="cx"> codeBlock->optimizeAfterWarmUp();
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return encodeResult(0, 0);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitJITOperationsh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/JITOperations.h (160820 => 160821)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/JITOperations.h 2013-12-19 03:13:18 UTC (rev 160820)
+++ branches/jsCStack/Source/JavaScriptCore/jit/JITOperations.h 2013-12-19 03:48:08 UTC (rev 160821)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx">
</span><span class="cx"> #include "CallFrame.h"
</span><ins>+#include "CommonSlowPaths.h"
</ins><span class="cx"> #include "JITExceptions.h"
</span><span class="cx"> #include "JSArray.h"
</span><span class="cx"> #include "JSCJSValue.h"
</span><span class="lines">@@ -72,6 +73,7 @@
</span><span class="cx"> Pc: Instruction* i.e. bytecode PC
</span><span class="cx"> R: Register
</span><span class="cx"> S: size_t
</span><ins>+ Sprt: SlowPathReturnType
</ins><span class="cx"> Ssi: StructureStubInfo*
</span><span class="cx"> St: Structure*
</span><span class="cx"> V: void
</span><span class="lines">@@ -133,6 +135,7 @@
</span><span class="cx"> typedef size_t JIT_OPERATION (*S_JITOperation_EJJ)(ExecState*, EncodedJSValue, EncodedJSValue);
</span><span class="cx"> typedef size_t JIT_OPERATION (*S_JITOperation_EOJss)(ExecState*, JSObject*, JSString*);
</span><span class="cx"> typedef size_t JIT_OPERATION (*S_JITOperation_J)(EncodedJSValue);
</span><ins>+typedef SlowPathReturnType JIT_OPERATION (*Sprt_JITOperation_EZ)(ExecState*, int32_t);
</ins><span class="cx"> typedef void JIT_OPERATION (*V_JITOperation_E)(ExecState*);
</span><span class="cx"> typedef void JIT_OPERATION (*V_JITOperation_EC)(ExecState*, JSCell*);
</span><span class="cx"> typedef void JIT_OPERATION (*V_JITOperation_ECb)(ExecState*, CodeBlock*);
</span><span class="lines">@@ -173,7 +176,6 @@
</span><span class="cx"> typedef char* JIT_OPERATION (*P_JITOperation_EStPS)(ExecState*, Structure*, void*, size_t);
</span><span class="cx"> typedef char* JIT_OPERATION (*P_JITOperation_EStSS)(ExecState*, Structure*, size_t, size_t);
</span><span class="cx"> typedef char* JIT_OPERATION (*P_JITOperation_EStZ)(ExecState*, Structure*, int32_t);
</span><del>-typedef char* JIT_OPERATION (*P_JITOperation_EZ)(ExecState*, int32_t);
</del><span class="cx"> typedef char* JIT_OPERATION (*P_JITOperation_EZZ)(ExecState*, int32_t, int32_t);
</span><span class="cx"> typedef StringImpl* JIT_OPERATION (*I_JITOperation_EJss)(ExecState*, JSString*);
</span><span class="cx"> typedef JSString* JIT_OPERATION (*Jss_JITOperation_EZ)(ExecState*, int32_t);
</span><span class="lines">@@ -241,7 +243,7 @@
</span><span class="cx"> void JIT_OPERATION operationThrow(ExecState*, EncodedJSValue) WTF_INTERNAL;
</span><span class="cx"> void JIT_OPERATION operationDebug(ExecState*, int32_t) WTF_INTERNAL;
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><del>-char* JIT_OPERATION operationOptimize(ExecState*, int32_t) WTF_INTERNAL;
</del><ins>+SlowPathReturnType JIT_OPERATION operationOptimize(ExecState*, int32_t) WTF_INTERNAL;
</ins><span class="cx"> #endif
</span><span class="cx"> void JIT_OPERATION operationPutByIndex(ExecState*, EncodedJSValue, int32_t, EncodedJSValue);
</span><span class="cx"> #if USE(JSVALUE64)
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/runtime/Options.h (160820 => 160821)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/runtime/Options.h 2013-12-19 03:13:18 UTC (rev 160820)
+++ branches/jsCStack/Source/JavaScriptCore/runtime/Options.h 2013-12-19 03:48:08 UTC (rev 160821)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> v(bool, reportCompileTimes, false) \
</span><span class="cx"> v(bool, verboseCFA, false) \
</span><span class="cx"> \
</span><del>- v(bool, enableOSREntryToDFG, false) \
</del><ins>+ v(bool, enableOSREntryToDFG, true) \
</ins><span class="cx"> \
</span><span class="cx"> v(bool, useExperimentalFTL, false) \
</span><span class="cx"> v(bool, useFTLTBAA, true) \
</span></span></pre>
</div>
</div>
</body>
</html>