Changeset 223891 in webkit

Timestamp:

Oct 24, 2017 9:36:37 AM (7 years ago)

Author:

Yusuke Suzuki

Message:

[JSC] Drop ArityCheckData
​https://bugs.webkit.org/show_bug.cgi?id=178648

Reviewed by Mark Lam.

ArityCheckData is used to return a pair of slotsToAdd and thunkToCall.
However, use of thunkToCall is removed in 64bit environment at r189575.

We remove thunkToCall and align 32bit implementation to 64bit implementation.
Since we no longer need to have the above pair, we can remove ArityCheckData too.

• llint/LowLevelInterpreter32_64.asm:
• llint/LowLevelInterpreter64.asm:
• runtime/CommonSlowPaths.cpp:

(JSC::SLOW_PATH_DECL):
(JSC::setupArityCheckData): Deleted.

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

(JSC::VM::VM):

• runtime/VM.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• llint/LowLevelInterpreter32_64.asm (modified) (1 diff)
• llint/LowLevelInterpreter64.asm (modified) (1 diff)
• runtime/CommonSlowPaths.cpp (modified) (3 diffs)
• runtime/CommonSlowPaths.h (modified) (1 diff)
• runtime/VM.cpp (modified) (1 diff)
• runtime/VM.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-10-22  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [JSC] Drop ArityCheckData
+        https://bugs.webkit.org/show_bug.cgi?id=178648
+
+        Reviewed by Mark Lam.
+
+        ArityCheckData is used to return a pair of `slotsToAdd` and `thunkToCall`.
+        However, use of `thunkToCall` is removed in 64bit environment at r189575.
+
+        We remove `thunkToCall` and align 32bit implementation to 64bit implementation.
+        Since we no longer need to have the above pair, we can remove ArityCheckData too.
+
+        * llint/LowLevelInterpreter32_64.asm:
+        * llint/LowLevelInterpreter64.asm:
+        * runtime/CommonSlowPaths.cpp:
+        (JSC::SLOW_PATH_DECL):
+        (JSC::setupArityCheckData): Deleted.
+        * runtime/CommonSlowPaths.h:
+        * runtime/VM.cpp:
+        (JSC::VM::VM):
+        * runtime/VM.h:
+
 2017-10-23  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm

@@ -580 +580 @@
 
 .noError:
-    # r1 points to ArityCheckData.
-    loadp CommonSlowPaths::ArityCheckData::thunkToCall[r1], t3
-    btpz t3, .proceedInline
-    
-    loadp CommonSlowPaths::ArityCheckData::paddedStackSpace[r1], a0
-    call t3
-    if ASSERT_ENABLED
-        loadp ReturnPC[cfr], t0
-        loadp [t0], t0
-    end
-    jmp .continue
-
-.proceedInline:
-    loadi CommonSlowPaths::ArityCheckData::paddedStackSpace[r1], t1
+    move r1, t1 # r1 contains slotsToAdd.
     btiz t1, .continue
     loadi PayloadOffset + ArgumentCount[cfr], t2

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm

@@ -515 +515 @@
 
 .noError:
-    loadi CommonSlowPaths::ArityCheckData::paddedStackSpace[r1], t1
+    move r1, t1 # r1 contains slotsToAdd.
     btiz t1, .continue
     loadi PayloadOffset + ArgumentCount[cfr], t2

trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp

@@ -168 +168 @@
     } while (false)
 
-static CommonSlowPaths::ArityCheckData* setupArityCheckData(VM& vm, int slotsToAdd)
-{
-    CommonSlowPaths::ArityCheckData* result = vm.arityCheckData.get();
-    result->paddedStackSpace = slotsToAdd;
-#if ENABLE(JIT)
-    if (vm.canUseJIT())
-        result->thunkToCall = vm.getCTIStub(arityFixupGenerator).code().executableAddress();
-    else
-#endif
-        result->thunkToCall = 0;
-    return result;
-}
-
 SLOW_PATH_DECL(slow_path_call_arityCheck)
 {
@@ -193 +180 @@
         RETURN_TWO(bitwise_cast<void*>(static_cast<uintptr_t>(1)), exec);
     }
-    RETURN_TWO(0, setupArityCheckData(vm, slotsToAdd));
+    RETURN_TWO(0, bitwise_cast<void*>(static_cast<uintptr_t>(slotsToAdd)));
 }
 
@@ -207 +194 @@
         RETURN_TWO(bitwise_cast<void*>(static_cast<uintptr_t>(1)), exec);
     }
-    RETURN_TWO(0, setupArityCheckData(vm, slotsToAdd));
+    RETURN_TWO(0, bitwise_cast<void*>(static_cast<uintptr_t>(slotsToAdd)));
 }
 

trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h

@@ -45 +45 @@
 
 namespace CommonSlowPaths {
-
-struct ArityCheckData {
-    unsigned paddedStackSpace;
-    void* thunkToCall;
-};
 
 ALWAYS_INLINE int numberOfExtraSlots(int argumentCountIncludingThis)

trunk/Source/JavaScriptCore/runtime/VM.cpp

@@ -293 +293 @@
     jitStubs = std::make_unique<JITThunks>();
 #endif
-    arityCheckData = std::make_unique<CommonSlowPaths::ArityCheckData>();
 
 #if ENABLE(FTL_JIT)

trunk/Source/JavaScriptCore/runtime/VM.h

@@ -148 +148 @@
 }
 #endif // ENABLE(FTL_JIT)
-namespace CommonSlowPaths {
-struct ArityCheckData;
-}
 namespace Profiler {
 class Database;
@@ -481 +478 @@
 
 #endif // ENABLE(JIT)
-    std::unique_ptr<CommonSlowPaths::ArityCheckData> arityCheckData;
 #if ENABLE(FTL_JIT)
     std::unique_ptr<FTL::Thunks> ftlThunks;