Title: [108819] trunk/Source/_javascript_Core
- Revision
- 108819
- Author
- [email protected]
- Date
- 2012-02-24 10:37:18 -0800 (Fri, 24 Feb 2012)
Log Message
Substitute ENABLE(CLASSIC_INTERPRETER) for ENABLE(INTERPRETER) in Interpreter.cpp
Reviewed by Oliver Hunt.
There are a few places in Interpreter.cpp that need to be updated to use
ENABLE(CLASSIC_INTERPRETER) following the renaming of ENABLE_INTERPRETER to
ENABLE_CLASSIC_INTERPRETER in changeset <http://trac.webkit.org/changeset/108020>
(https://bugs.webkit.org/show_bug.cgi?id=78791).
* interpreter/Interpreter.cpp:
(JSC::getLineNumberForCallFrame):
(JSC::getCallerInfo):
(JSC::getSourceURLFromCallFrame):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (108818 => 108819)
--- trunk/Source/_javascript_Core/ChangeLog 2012-02-24 18:26:49 UTC (rev 108818)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-02-24 18:37:18 UTC (rev 108819)
@@ -1,3 +1,19 @@
+2012-02-24 Daniel Bates <[email protected]>
+
+ Substitute ENABLE(CLASSIC_INTERPRETER) for ENABLE(INTERPRETER) in Interpreter.cpp
+
+ Reviewed by Oliver Hunt.
+
+ There are a few places in Interpreter.cpp that need to be updated to use
+ ENABLE(CLASSIC_INTERPRETER) following the renaming of ENABLE_INTERPRETER to
+ ENABLE_CLASSIC_INTERPRETER in changeset <http://trac.webkit.org/changeset/108020>
+ (https://bugs.webkit.org/show_bug.cgi?id=78791).
+
+ * interpreter/Interpreter.cpp:
+ (JSC::getLineNumberForCallFrame):
+ (JSC::getCallerInfo):
+ (JSC::getSourceURLFromCallFrame):
+
2012-02-24 Adam Roben <[email protected]>
Undo the BUILDING_WTF part of r108808
Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.cpp (108818 => 108819)
--- trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2012-02-24 18:26:49 UTC (rev 108818)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2012-02-24 18:37:18 UTC (rev 108819)
@@ -823,7 +823,7 @@
CodeBlock* codeBlock = callFrame->codeBlock();
if (!codeBlock)
return -1;
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
if (!globalData->canUseJIT())
return codeBlock->lineNumberForBytecodeOffset(callFrame->bytecodeOffsetForNonDFGCode() - 1);
#endif
@@ -854,7 +854,7 @@
if (callframeIsHost) {
// Don't need to deal with inline callframes here as by definition we haven't
// inlined a call with an intervening native call frame.
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
if (!globalData->canUseJIT()) {
bytecodeOffset = callerFrame->bytecodeOffsetForNonDFGCode();
lineNumber = callerCodeBlock->lineNumberForBytecodeOffset(bytecodeOffset - 1);
@@ -870,7 +870,7 @@
bytecodeOffset = callerFrame->bytecodeOffsetForNonDFGCode();
#endif
} else {
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
if (!globalData->canUseJIT()) {
bytecodeOffset = callerCodeBlock->bytecodeOffset(callFrame->returnVPC());
lineNumber = callerCodeBlock->lineNumberForBytecodeOffset(bytecodeOffset - 1);
@@ -914,7 +914,7 @@
static ALWAYS_INLINE const UString getSourceURLFromCallFrame(CallFrame* callFrame)
{
ASSERT(!callFrame->hasHostCallFrameFlag());
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
#if ENABLE(JIT)
if (callFrame->globalData().canUseJIT())
return callFrame->codeBlock()->ownerExecutable()->sourceURL();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
