Changeset 237059 in webkit

Timestamp:

Oct 11, 2018, 6:32:19 PM (6 years ago)

Author:

yusukesuzuki@slowstart.org

Message:

Use currentStackPointer more
​https://bugs.webkit.org/show_bug.cgi?id=190503

Reviewed by Saam Barati.

Source/JavaScriptCore:

• runtime/VM.cpp:

(JSC::VM::committedStackByteCount):

Source/WTF:

Use WTF::currentStackPointer more in WebKit to adopt ASAN detect_stack_use_after_return option.

• wtf/StackBounds.cpp:

(WTF::testStackDirection2):
(WTF::testStackDirection):

• wtf/ThreadingPthreads.cpp:

(WTF::Thread::signalHandlerSuspendResume):
(WTF::getApproximateStackPointer): Deleted.

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/VM.cpp (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/StackBounds.cpp (modified) (2 diffs)
• WTF/wtf/ThreadingPthreads.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-10-11  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
+
+        Use currentStackPointer more
+        https://bugs.webkit.org/show_bug.cgi?id=190503
+
+        Reviewed by Saam Barati.
+
+        * runtime/VM.cpp:
+        (JSC::VM::committedStackByteCount):
+
 2018-10-08  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
 

trunk/Source/JavaScriptCore/runtime/VM.cpp

@@ -1158 +1158 @@
     // committed. So, we use the current stack usage as an estimate.
     ASSERT(Thread::current().stack().isGrowingDownward());
-    int8_t* current = reinterpret_cast<int8_t*>(&current);
-    int8_t* high = reinterpret_cast<int8_t*>(Thread::current().stack().origin());
+    uint8_t* current = bitwise_cast<uint8_t*>(currentStackPointer());
+    uint8_t* high = bitwise_cast<uint8_t*>(Thread::current().stack().origin());
     return high - current;
 #else

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-10-11  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
+
+        Use currentStackPointer more
+        https://bugs.webkit.org/show_bug.cgi?id=190503
+
+        Reviewed by Saam Barati.
+
+        Use WTF::currentStackPointer more in WebKit to adopt ASAN detect_stack_use_after_return option.
+
+        * wtf/StackBounds.cpp:
+        (WTF::testStackDirection2):
+        (WTF::testStackDirection):
+        * wtf/ThreadingPthreads.cpp:
+        (WTF::Thread::signalHandlerSuspendResume):
+        (WTF::getApproximateStackPointer): Deleted.
+
 2018-10-11  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/WTF/wtf/StackBounds.cpp

@@ -51 +51 @@
 }
 #else
-static NEVER_INLINE NOT_TAIL_CALLED StackBounds::StackDirection testStackDirection2(volatile const int* pointer)
-{
-    volatile int stackValue = 42;
-    return (pointer < &stackValue) ? StackBounds::StackDirection::Upward : StackBounds::StackDirection::Downward;
+static NEVER_INLINE NOT_TAIL_CALLED StackBounds::StackDirection testStackDirection2(volatile const uint8_t* pointer)
+{
+    volatile uint8_t* stackValue = bitwise_cast<uint8_t*>(currentStackPointer());
+    return (pointer < stackValue) ? StackBounds::StackDirection::Upward : StackBounds::StackDirection::Downward;
 }
 
@@ -60 +60 @@
 {
     NO_TAIL_CALLS();
-    volatile int stackValue = 42;
-    return testStackDirection2(&stackValue);
+    volatile uint8_t* stackValue = bitwise_cast<uint8_t*>(currentStackPointer());
+    return testStackDirection2(stackValue);
 }
 

trunk/Source/WTF/wtf/ThreadingPthreads.cpp

@@ -110 +110 @@
 static std::atomic<Thread*> targetThread { nullptr };
 
-IGNORE_GCC_WARNINGS_BEGIN("return-local-addr")
-IGNORE_CLANG_WARNINGS_BEGIN("return-stack-address")
-
-static NEVER_INLINE void* getApproximateStackPointer()
-{
-    volatile uintptr_t stackLocation;
-    stackLocation = bitwise_cast<uintptr_t>(&stackLocation);
-    return bitwise_cast<void*>(stackLocation);
-}
-
-IGNORE_CLANG_WARNINGS_END
-IGNORE_GCC_WARNINGS_END
-
 void Thread::signalHandlerSuspendResume(int, siginfo_t*, void* ucontext)
 {
@@ -138 +125 @@
     }
 
-    void* approximateStackPointer = getApproximateStackPointer();
+    void* approximateStackPointer = currentStackPointer();
     if (!thread->m_stack.contains(approximateStackPointer)) {
         // This happens if we use an alternative signal stack.