Changeset 148709 in webkit for trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

Timestamp:

Apr 18, 2013, 3:45:25 PM (12 years ago)

Author:

[email protected]

Message:

Interpreter entry points should throw the TerminatedExecutionException from the caller frame.
​https://bugs.webkit.org/show_bug.cgi?id=114816.

Reviewed by Oliver Hunt.

• interpreter/Interpreter.cpp:

(JSC::Interpreter::execute):
(JSC::Interpreter::executeCall):
(JSC::Interpreter::executeConstruct):

File:

• trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (modified) (15 diffs)

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -1017 +1017 @@
     ProgramCodeBlock* codeBlock = &program->generatedBytecode();
 
+    if (UNLIKELY(vm.watchdog.didFire(callFrame)))
+        return throwTerminatedExecutionException(callFrame);
+
     // Push the call frame for this invocation:
     ASSERT(codeBlock->numParameters() == 1); // 1 parameter for 'this'.
@@ -1031 +1034 @@
     // Execute the code:
     JSValue result;
-    if (LIKELY(!vm.watchdog.didFire(newCallFrame))) {
+    {
         SamplingTool::CallRecord callRecord(m_sampler.get());
         Watchdog::Scope watchdogScope(vm.watchdog);
@@ -1040 +1043 @@
         result = program->generatedJITCode().execute(&m_stack, newCallFrame, &vm);
 #endif // ENABLE(JIT)
-    } else
-        result = throwTerminatedExecutionException(newCallFrame);
+    }
 
     if (LegacyProfiler* profiler = vm.enabledProfiler())
@@ -1090 +1092 @@
         newCodeBlock = 0;
 
+    if (UNLIKELY(vm.watchdog.didFire(callFrame)))
+        return throwTerminatedExecutionException(callFrame);
+
     CallFrame* newCallFrame = m_stack.pushFrame(callFrame, newCodeBlock, scope, argsCount, function);
     if (UNLIKELY(!newCallFrame))
@@ -1103 +1108 @@
 
     JSValue result;
-    if (LIKELY(!vm.watchdog.didFire(newCallFrame))) {
+    {
         SamplingTool::CallRecord callRecord(m_sampler.get(), !isJSCall);
         Watchdog::Scope watchdogScope(vm.watchdog);
@@ -1116 +1121 @@
         } else
             result = JSValue::decode(callData.native.function(newCallFrame));
-    } else
-        result = throwTerminatedExecutionException(newCallFrame);
+    }
 
     if (LegacyProfiler* profiler = vm.enabledProfiler())
@@ -1167 +1171 @@
         newCodeBlock = 0;
 
+    if (UNLIKELY(vm.watchdog.didFire(callFrame)))
+        return throwTerminatedExecutionException(callFrame);
+
     CallFrame* newCallFrame = m_stack.pushFrame(callFrame, newCodeBlock, scope, argsCount, constructor);
     if (UNLIKELY(!newCallFrame))
@@ -1180 +1187 @@
 
     JSValue result;
-    if (LIKELY(!vm.watchdog.didFire(newCallFrame))) {
+    {
         SamplingTool::CallRecord callRecord(m_sampler.get(), !isJSConstruct);
         Watchdog::Scope watchdogScope(vm.watchdog);
@@ -1193 +1200 @@
         } else
             result = JSValue::decode(constructData.native.function(newCallFrame));
-    } else
-        result = throwTerminatedExecutionException(newCallFrame);
+    }
 
     if (LegacyProfiler* profiler = vm.enabledProfiler())
@@ -1265 +1271 @@
     if (LegacyProfiler* profiler = vm.enabledProfiler())
         profiler->willExecute(closure.oldCallFrame, closure.function);
+
+    if (UNLIKELY(vm.watchdog.didFire(closure.oldCallFrame)))
+        return throwTerminatedExecutionException(closure.oldCallFrame);
 
     // The code execution below may push more frames and point the topCallFrame
@@ -1278 +1287 @@
     // Execute the code:
     JSValue result;
-    if (LIKELY(!vm.watchdog.didFire(closure.newCallFrame))) {
+    {
         SamplingTool::CallRecord callRecord(m_sampler.get());
         Watchdog::Scope watchdogScope(vm.watchdog);
@@ -1287 +1296 @@
         result = closure.functionExecutable->generatedJITCodeForCall().execute(&m_stack, closure.newCallFrame, &vm);
 #endif // ENABLE(JIT)
-    } else
-        result = throwTerminatedExecutionException(closure.newCallFrame);
+    }
 
     if (LegacyProfiler* profiler = vm.enabledProfiler())
@@ -1362 +1370 @@
     }
 
+    if (UNLIKELY(vm.watchdog.didFire(callFrame)))
+        return throwTerminatedExecutionException(callFrame);
+
     // Push the frame:
     ASSERT(codeBlock->numParameters() == 1); // 1 parameter for 'this'.
@@ -1376 +1387 @@
     // Execute the code:
     JSValue result;
-    if (LIKELY(!vm.watchdog.didFire(newCallFrame))) {
+    {
         SamplingTool::CallRecord callRecord(m_sampler.get());
         Watchdog::Scope watchdogScope(vm.watchdog);
@@ -1385 +1396 @@
         result = eval->generatedJITCode().execute(&m_stack, newCallFrame, &vm);
 #endif // ENABLE(JIT)
-    } else
-        result = throwTerminatedExecutionException(newCallFrame);
+    }
 
     if (LegacyProfiler* profiler = vm.enabledProfiler())