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

Timestamp:

Mar 2, 2017, 12:35:37 PM (8 years ago)

Author:

[email protected]

Message:

Add support for selective handling of VM traps.
​https://bugs.webkit.org/show_bug.cgi?id=169087

Reviewed by Keith Miller.

This is needed because there are some places in the VM where it's appropriate to
handle some types of VM traps but not others.

We implement this selection by using a VMTraps::Mask that allows the user to
specify which traps should be serviced.

• interpreter/Interpreter.cpp:

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

• runtime/VM.cpp:

(JSC::VM::handleTraps):

• runtime/VM.h:
• runtime/VMTraps.cpp:

(JSC::VMTraps::takeTrap): Deleted.

• runtime/VMTraps.h:

(JSC::VMTraps::Mask::Mask):
(JSC::VMTraps::Mask::allEventTypes):
(JSC::VMTraps::Mask::bits):
(JSC::VMTraps::Mask::init):
(JSC::VMTraps::needTrapHandling):
(JSC::VMTraps::hasTrapForEvent):

File:

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

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -862 +862 @@
 
     if (UNLIKELY(vm.needTrapHandling())) {
-        vm.handleTraps(callFrame);
+        VMTraps::Mask mask(VMTraps::NeedTermination, VMTraps::NeedWatchdogCheck);
+        vm.handleTraps(callFrame, mask);
         RETURN_IF_EXCEPTION(throwScope, throwScope.exception());
     }
@@ -922 +923 @@
 
     if (UNLIKELY(vm.needTrapHandling())) {
-        vm.handleTraps(callFrame);
+        VMTraps::Mask mask(VMTraps::NeedTermination, VMTraps::NeedWatchdogCheck);
+        vm.handleTraps(callFrame, mask);
         RETURN_IF_EXCEPTION(throwScope, throwScope.exception());
     }
@@ -987 +989 @@
 
     if (UNLIKELY(vm.needTrapHandling())) {
-        vm.handleTraps(callFrame);
+        VMTraps::Mask mask(VMTraps::NeedTermination, VMTraps::NeedWatchdogCheck);
+        vm.handleTraps(callFrame, mask);
         RETURN_IF_EXCEPTION(throwScope, throwScope.exception());
     }
@@ -1051 +1054 @@
 
     if (UNLIKELY(vm.needTrapHandling())) {
-        vm.handleTraps(closure.oldCallFrame);
+        VMTraps::Mask mask(VMTraps::NeedTermination, VMTraps::NeedWatchdogCheck);
+        vm.handleTraps(closure.oldCallFrame, mask);
         RETURN_IF_EXCEPTION(throwScope, throwScope.exception());
     }
@@ -1154 +1158 @@
 
     if (UNLIKELY(vm.needTrapHandling())) {
-        vm.handleTraps(callFrame);
+        VMTraps::Mask mask(VMTraps::NeedTermination, VMTraps::NeedWatchdogCheck);
+        vm.handleTraps(callFrame, mask);
         RETURN_IF_EXCEPTION(throwScope, throwScope.exception());
     }
@@ -1195 +1200 @@
 
     if (UNLIKELY(vm.needTrapHandling())) {
-        vm.handleTraps(callFrame);
+        VMTraps::Mask mask(VMTraps::NeedTermination, VMTraps::NeedWatchdogCheck);
+        vm.handleTraps(callFrame, mask);
         RETURN_IF_EXCEPTION(throwScope, throwScope.exception());
     }