Title: [156233] trunk/Source/_javascript_Core
- Revision
- 156233
- Author
- [email protected]
- Date
- 2013-09-21 12:05:41 -0700 (Sat, 21 Sep 2013)
Log Message
Fix the non-DFG build.
* interpreter/Interpreter.cpp:
(JSC::unwindCallFrame):
* interpreter/StackVisitor.cpp:
(JSC::StackVisitor::Frame::r):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (156232 => 156233)
--- trunk/Source/_javascript_Core/ChangeLog 2013-09-21 18:46:09 UTC (rev 156232)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-09-21 19:05:41 UTC (rev 156233)
@@ -1,3 +1,12 @@
+2013-09-21 Anders Carlsson <[email protected]>
+
+ Fix the non-DFG build.
+
+ * interpreter/Interpreter.cpp:
+ (JSC::unwindCallFrame):
+ * interpreter/StackVisitor.cpp:
+ (JSC::StackVisitor::Frame::r):
+
2013-09-21 Filip Pizlo <[email protected]>
Get rid of IsInlinedCodeTag and its associated methods since it's unused
Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.cpp (156232 => 156233)
--- trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2013-09-21 18:46:09 UTC (rev 156232)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2013-09-21 19:05:41 UTC (rev 156233)
@@ -407,7 +407,9 @@
JSValue activation;
if (oldCodeBlock->codeType() == FunctionCode && oldCodeBlock->needsActivation()) {
+#if ENABLE(DFG_JIT)
RELEASE_ASSERT(!visitor->isInlinedFrame());
+#endif
activation = callFrame->uncheckedR(oldCodeBlock->activationRegister()).jsValue();
if (activation)
jsCast<JSActivation*>(activation)->tearOff(*scope->vm());
@@ -417,8 +419,10 @@
if (JSValue arguments = visitor->r(unmodifiedArgumentsRegister(oldCodeBlock->argumentsRegister())).jsValue()) {
if (activation)
jsCast<Arguments*>(arguments)->didTearOffActivation(callFrame, jsCast<JSActivation*>(activation));
+#if ENABLE(DFG_JIT)
else if (visitor->isInlinedFrame())
jsCast<Arguments*>(arguments)->tearOff(callFrame, visitor->inlineCallFrame());
+#endif
else
jsCast<Arguments*>(arguments)->tearOff(callFrame);
}
Modified: trunk/Source/_javascript_Core/interpreter/StackVisitor.cpp (156232 => 156233)
--- trunk/Source/_javascript_Core/interpreter/StackVisitor.cpp 2013-09-21 18:46:09 UTC (rev 156232)
+++ trunk/Source/_javascript_Core/interpreter/StackVisitor.cpp 2013-09-21 19:05:41 UTC (rev 156233)
@@ -289,11 +289,12 @@
Register& StackVisitor::Frame::r(int index)
{
- int offset;
+ int offset = 0;
+
+#if ENABLE(DFG_JIT)
if (isInlinedFrame())
offset = inlineCallFrame()->stackOffset;
- else
- offset = 0;
+#endif
return callFrame()->r(offset + index);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
