Changeset 245646 in webkit

Timestamp:

May 22, 2019 2:03:20 PM (5 years ago)

Author:

Tadeu Zagallo

Message:

Fix validateExceptionChecks for CLoop
​https://bugs.webkit.org/show_bug.cgi?id=191253

Reviewed by Keith Miller.

validateExceptionChecks relies on the stack position to determine if
an ExceptionScope was going to be handled by LLInt or JIT, but when
running with CLoop, it was comparing VM::topEntryFrame, which was an
address inside the CLoopStack to machine stack. This caused exceptions
to never be checked on x86 and always fail on ARM.

• runtime/CatchScope.h:
• runtime/ExceptionScope.h:
• runtime/ThrowScope.h:
• runtime/VM.cpp:

(JSC::VM::currentCLoopStackPointer const):

• runtime/VM.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/CatchScope.h (modified) (1 diff)
• runtime/ExceptionScope.h (modified) (2 diffs)
• runtime/ThrowScope.h (modified) (1 diff)
• runtime/VM.cpp (modified) (1 diff)
• runtime/VM.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-05-22 Zagallo  <tzagallo@apple.com>
+
+        Fix validateExceptionChecks for CLoop
+        https://bugs.webkit.org/show_bug.cgi?id=191253
+
+        Reviewed by Keith Miller.
+
+        validateExceptionChecks relies on the stack position to determine if
+        an ExceptionScope was going to be handled by LLInt or JIT, but when
+        running with CLoop, it was comparing VM::topEntryFrame, which was an
+        address inside the CLoopStack to machine stack. This caused exceptions
+        to never be checked on x86 and always fail on ARM.
+
+        * runtime/CatchScope.h:
+        * runtime/ExceptionScope.h:
+        * runtime/ThrowScope.h:
+        * runtime/VM.cpp:
+        (JSC::VM::currentCLoopStackPointer const):
+        * runtime/VM.h:
+
 2019-05-22  Tadeu Zagallo  <tzagallo@apple.com>
 

trunk/Source/JavaScriptCore/runtime/CatchScope.h

@@ -49 +49 @@
 
 #define DECLARE_CATCH_SCOPE(vm__) \
-    JSC::CatchScope((vm__), JSC::ExceptionEventLocation(EXCEPTION_SCOPE_POSITION_FOR_ASAN, __FUNCTION__, __FILE__, __LINE__))
+    JSC::CatchScope((vm__), JSC::ExceptionEventLocation(EXCEPTION_SCOPE_POSITION_FOR_ASAN(vm__), __FUNCTION__, __FILE__, __LINE__))
 
 #else // not ENABLE(EXCEPTION_SCOPE_VERIFICATION)

trunk/Source/JavaScriptCore/runtime/ExceptionScope.h

@@ -39 +39 @@
 #define EXCEPTION_ASSERT_WITH_MESSAGE(assertion, message) RELEASE_ASSERT_WITH_MESSAGE(assertion, message)
 
-#if ASAN_ENABLED && COMPILER(GCC_COMPATIBLE)
-#define EXCEPTION_SCOPE_POSITION_FOR_ASAN currentStackPointer()
+#if ENABLE(C_LOOP)
+#define EXCEPTION_SCOPE_POSITION_FOR_ASAN(vm__) (vm__).currentCLoopStackPointer()
+#elif ASAN_ENABLED && COMPILER(GCC_COMPATIBLE)
+#define EXCEPTION_SCOPE_POSITION_FOR_ASAN(vm__) currentStackPointer()
 #else
-#define EXCEPTION_SCOPE_POSITION_FOR_ASAN nullptr
+#define EXCEPTION_SCOPE_POSITION_FOR_ASAN(vm__) nullptr
 #endif
 
@@ -54 +56 @@
     ALWAYS_INLINE void releaseAssertNoException() { RELEASE_ASSERT_WITH_MESSAGE(!exception(), "%s", unexpectedExceptionMessage().data()); }
 
-#if ASAN_ENABLED
+#if ASAN_ENABLED || ENABLE(C_LOOP)
     const void* stackPosition() const {  return m_location.stackPosition; }
 #else

trunk/Source/JavaScriptCore/runtime/ThrowScope.h

@@ -63 +63 @@
 
 #define DECLARE_THROW_SCOPE(vm__) \
-    JSC::ThrowScope((vm__), JSC::ExceptionEventLocation(EXCEPTION_SCOPE_POSITION_FOR_ASAN, __FUNCTION__, __FILE__, __LINE__))
+    JSC::ThrowScope((vm__), JSC::ExceptionEventLocation(EXCEPTION_SCOPE_POSITION_FOR_ASAN(vm__), __FUNCTION__, __FILE__, __LINE__))
 
 #define throwScopePrintIfNeedCheck(scope__) \

trunk/Source/JavaScriptCore/runtime/VM.cpp

@@ -1149 +1149 @@
     return interpreter->cloopStack().isSafeToRecurse();
 }
+
+void* VM::currentCLoopStackPointer() const
+{
+    return interpreter->cloopStack().currentStackPointer();
+}
 #endif // ENABLE(C_LOOP)
 

trunk/Source/JavaScriptCore/runtime/VM.h

@@ -731 +731 @@
     void* cloopStackLimit() { return m_cloopStackLimit; }
     void setCLoopStackLimit(void* limit) { m_cloopStackLimit = limit; }
+    JS_EXPORT_PRIVATE void* currentCLoopStackPointer() const;
 #endif