summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp')
-rw-r--r--Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp b/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp
index e924ad34c..a5d045cb9 100644
--- a/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp
+++ b/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp
@@ -32,6 +32,7 @@
#include "JSFunction.h"
#include "CodeBlock.h"
#include "Interpreter.h"
+#include "Operations.h"
#include "Parser.h"
namespace JSC {
@@ -89,17 +90,17 @@ JSValue DebuggerCallFrame::evaluate(const String& script, JSValue& exception) co
if (!m_callFrame->codeBlock())
return JSValue();
- JSGlobalData& globalData = m_callFrame->globalData();
- EvalExecutable* eval = EvalExecutable::create(m_callFrame, makeSource(script), m_callFrame->codeBlock()->isStrictMode());
- if (globalData.exception) {
- exception = globalData.exception;
- globalData.exception = JSValue();
+ VM& vm = m_callFrame->vm();
+ EvalExecutable* eval = EvalExecutable::create(m_callFrame, m_callFrame->codeBlock()->unlinkedCodeBlock()->codeCacheForEval(), makeSource(script), m_callFrame->codeBlock()->isStrictMode());
+ if (vm.exception) {
+ exception = vm.exception;
+ vm.exception = JSValue();
}
- JSValue result = globalData.interpreter->execute(eval, m_callFrame, thisObject(), m_callFrame->scope());
- if (globalData.exception) {
- exception = globalData.exception;
- globalData.exception = JSValue();
+ JSValue result = vm.interpreter->execute(eval, m_callFrame, thisObject(), m_callFrame->scope());
+ if (vm.exception) {
+ exception = vm.exception;
+ vm.exception = JSValue();
}
ASSERT(result);
return result;