Changeset 229709 in webkit

Timestamp:

Mar 19, 2018 1:22:30 PM (6 years ago)

Author:

mark.lam@apple.com

Message:

FunctionPtr should be passed by value.
​https://bugs.webkit.org/show_bug.cgi?id=183746
<rdar://problem/38625311>

Reviewed by JF Bastien.

It's meant to be an encapsulation of a C/C++ function pointer. There are cases
where we use it to pass JIT compiled code (e.g. the VM thunks/stubs), but they are
treated as if they are C/C++ functions.

Regardless, there's no need to pass it by reference.

• assembler/MacroAssemblerCodeRef.h:
• dfg/DFGJITCompiler.h:

(JSC::DFG::JITCompiler::appendCall):

• dfg/DFGSpeculativeJIT.h:

(JSC::DFG::SpeculativeJIT::appendCall):
(JSC::DFG::SpeculativeJIT::appendCallWithCallFrameRollbackOnException):
(JSC::DFG::SpeculativeJIT::appendCallWithCallFrameRollbackOnExceptionSetResult):
(JSC::DFG::SpeculativeJIT::appendCallSetResult):

• jit/JIT.h:

(JSC::JIT::appendCall):
(JSC::JIT::appendCallWithSlowPathReturnType):

• jit/JITInlines.h:

(JSC::JIT::appendCallWithExceptionCheck):
(JSC::JIT::appendCallWithExceptionCheckAndSlowPathReturnType):
(JSC::JIT::appendCallWithCallFrameRollbackOnException):
(JSC::JIT::appendCallWithExceptionCheckSetJSValueResult):
(JSC::JIT::appendCallWithExceptionCheckSetJSValueResultWithProfile):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/MacroAssemblerCodeRef.h (modified) (1 diff)
• dfg/DFGJITCompiler.h (modified) (1 diff)
• dfg/DFGSpeculativeJIT.h (modified) (9 diffs)
• jit/JIT.h (modified) (3 diffs)
• jit/JITInlines.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-03-19  Mark Lam  <mark.lam@apple.com>
+
+        FunctionPtr should be passed by value.
+        https://bugs.webkit.org/show_bug.cgi?id=183746
+        <rdar://problem/38625311>
+
+        Reviewed by JF Bastien.
+
+        It's meant to be an encapsulation of a C/C++ function pointer.  There are cases
+        where we use it to pass JIT compiled code (e.g. the VM thunks/stubs), but they are
+        treated as if they are C/C++ functions.
+
+        Regardless, there's no need to pass it by reference.
+
+        * assembler/MacroAssemblerCodeRef.h:
+        * dfg/DFGJITCompiler.h:
+        (JSC::DFG::JITCompiler::appendCall):
+        * dfg/DFGSpeculativeJIT.h:
+        (JSC::DFG::SpeculativeJIT::appendCall):
+        (JSC::DFG::SpeculativeJIT::appendCallWithCallFrameRollbackOnException):
+        (JSC::DFG::SpeculativeJIT::appendCallWithCallFrameRollbackOnExceptionSetResult):
+        (JSC::DFG::SpeculativeJIT::appendCallSetResult):
+        * jit/JIT.h:
+        (JSC::JIT::appendCall):
+        (JSC::JIT::appendCallWithSlowPathReturnType):
+        * jit/JITInlines.h:
+        (JSC::JIT::appendCallWithExceptionCheck):
+        (JSC::JIT::appendCallWithExceptionCheckAndSlowPathReturnType):
+        (JSC::JIT::appendCallWithCallFrameRollbackOnException):
+        (JSC::JIT::appendCallWithExceptionCheckSetJSValueResult):
+        (JSC::JIT::appendCallWithExceptionCheckSetJSValueResultWithProfile):
+
 2018-03-15  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h

@@ -127 +127 @@
 };
 
+static_assert(sizeof(FunctionPtr) == sizeof(void*), "");
+static_assert(std::is_trivially_copyable<FunctionPtr>::value, "");
+
 // ReturnAddressPtr:
 //

trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.h

@@ -157 +157 @@
 
     // Add a call out from JIT code, without an exception check.
-    Call appendCall(const FunctionPtr& function)
+    Call appendCall(const FunctionPtr function)
     {
         Call functionCall = call(NoPtrTag);

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h

@@ -1008 +1008 @@
 
     // These methods add call instructions, optionally setting results, and optionally rolling back the call frame on an exception.
-    JITCompiler::Call appendCall(const FunctionPtr& function)
+    JITCompiler::Call appendCall(const FunctionPtr function)
     {
         prepareForExternalCall();
@@ -1014 +1014 @@
         return m_jit.appendCall(function);
     }
-    JITCompiler::Call appendCallWithCallFrameRollbackOnException(const FunctionPtr& function)
+    JITCompiler::Call appendCallWithCallFrameRollbackOnException(const FunctionPtr function)
     {
         JITCompiler::Call call = appendCall(function);
@@ -1020 +1020 @@
         return call;
     }
-    JITCompiler::Call appendCallWithCallFrameRollbackOnExceptionSetResult(const FunctionPtr& function, GPRReg result)
+    JITCompiler::Call appendCallWithCallFrameRollbackOnExceptionSetResult(const FunctionPtr function, GPRReg result)
     {
         JITCompiler::Call call = appendCallWithCallFrameRollbackOnException(function);
@@ -1027 +1027 @@
         return call;
     }
-    JITCompiler::Call appendCallSetResult(const FunctionPtr& function, GPRReg result)
+    JITCompiler::Call appendCallSetResult(const FunctionPtr function, GPRReg result)
     {
         JITCompiler::Call call = appendCall(function);
@@ -1034 +1034 @@
         return call;
     }
-    JITCompiler::Call appendCallSetResult(const FunctionPtr& function, GPRReg result1, GPRReg result2)
+    JITCompiler::Call appendCallSetResult(const FunctionPtr function, GPRReg result1, GPRReg result2)
     {
         JITCompiler::Call call = appendCall(function);
@@ -1040 +1040 @@
         return call;
     }
-    JITCompiler::Call appendCallSetResult(const FunctionPtr& function, JSValueRegs resultRegs)
+    JITCompiler::Call appendCallSetResult(const FunctionPtr function, JSValueRegs resultRegs)
     {
 #if USE(JSVALUE64)
@@ -1049 +1049 @@
     }
 #if CPU(X86)
-    JITCompiler::Call appendCallSetResult(const FunctionPtr& function, FPRReg result)
+    JITCompiler::Call appendCallSetResult(const FunctionPtr function, FPRReg result)
     {
         JITCompiler::Call call = appendCall(function);
@@ -1059 +1059 @@
     }
 #elif CPU(ARM) && !CPU(ARM_HARDFP)
-    JITCompiler::Call appendCallSetResult(const FunctionPtr& function, FPRReg result)
+    JITCompiler::Call appendCallSetResult(const FunctionPtr function, FPRReg result)
     {
         JITCompiler::Call call = appendCall(function);
@@ -1067 +1067 @@
     }
 #else // CPU(X86_64) || (CPU(ARM) && CPU(ARM_HARDFP)) || CPU(ARM64) || CPU(MIPS)
-    JITCompiler::Call appendCallSetResult(const FunctionPtr& function, FPRReg result)
+    JITCompiler::Call appendCallSetResult(const FunctionPtr function, FPRReg result)
     {
         JITCompiler::Call call = appendCall(function);

trunk/Source/JavaScriptCore/jit/JIT.h

@@ -268 +268 @@
 
         // Add a call out from JIT code, without an exception check.
-        Call appendCall(const FunctionPtr& function)
+        Call appendCall(const FunctionPtr function)
         {
             Call functionCall = call(NoPtrTag);
@@ -276 +276 @@
 
 #if OS(WINDOWS) && CPU(X86_64)
-        Call appendCallWithSlowPathReturnType(const FunctionPtr& function)
+        Call appendCallWithSlowPathReturnType(const FunctionPtr function)
         {
             Call functionCall = callWithSlowPathReturnType();
@@ -705 +705 @@
         }
 
-        MacroAssembler::Call appendCallWithExceptionCheck(const FunctionPtr&);
+        MacroAssembler::Call appendCallWithExceptionCheck(const FunctionPtr);
 #if OS(WINDOWS) && CPU(X86_64)
-        MacroAssembler::Call appendCallWithExceptionCheckAndSlowPathReturnType(const FunctionPtr&);
-#endif
-        MacroAssembler::Call appendCallWithCallFrameRollbackOnException(const FunctionPtr&);
-        MacroAssembler::Call appendCallWithExceptionCheckSetJSValueResult(const FunctionPtr&, int);
-        MacroAssembler::Call appendCallWithExceptionCheckSetJSValueResultWithProfile(const FunctionPtr&, int);
+        MacroAssembler::Call appendCallWithExceptionCheckAndSlowPathReturnType(const FunctionPtr);
+#endif
+        MacroAssembler::Call appendCallWithCallFrameRollbackOnException(const FunctionPtr);
+        MacroAssembler::Call appendCallWithExceptionCheckSetJSValueResult(const FunctionPtr, int);
+        MacroAssembler::Call appendCallWithExceptionCheckSetJSValueResultWithProfile(const FunctionPtr, int);
         
         template<typename OperationType, typename... Args>

trunk/Source/JavaScriptCore/jit/JITInlines.h

@@ -150 +150 @@
 }
 
-ALWAYS_INLINE MacroAssembler::Call JIT::appendCallWithExceptionCheck(const FunctionPtr& function)
+ALWAYS_INLINE MacroAssembler::Call JIT::appendCallWithExceptionCheck(const FunctionPtr function)
 {
     updateTopCallFrame();
@@ -159 +159 @@
 
 #if OS(WINDOWS) && CPU(X86_64)
-ALWAYS_INLINE MacroAssembler::Call JIT::appendCallWithExceptionCheckAndSlowPathReturnType(const FunctionPtr& function)
+ALWAYS_INLINE MacroAssembler::Call JIT::appendCallWithExceptionCheckAndSlowPathReturnType(const FunctionPtr function)
 {
     updateTopCallFrame();
@@ -168 +168 @@
 #endif
 
-ALWAYS_INLINE MacroAssembler::Call JIT::appendCallWithCallFrameRollbackOnException(const FunctionPtr& function)
+ALWAYS_INLINE MacroAssembler::Call JIT::appendCallWithCallFrameRollbackOnException(const FunctionPtr function)
 {
     updateTopCallFrame(); // The callee is responsible for setting topCallFrame to their caller
@@ -176 +176 @@
 }
 
-ALWAYS_INLINE MacroAssembler::Call JIT::appendCallWithExceptionCheckSetJSValueResult(const FunctionPtr& function, int dst)
+ALWAYS_INLINE MacroAssembler::Call JIT::appendCallWithExceptionCheckSetJSValueResult(const FunctionPtr function, int dst)
 {
     MacroAssembler::Call call = appendCallWithExceptionCheck(function);
@@ -187 +187 @@
 }
 
-ALWAYS_INLINE MacroAssembler::Call JIT::appendCallWithExceptionCheckSetJSValueResultWithProfile(const FunctionPtr& function, int dst)
+ALWAYS_INLINE MacroAssembler::Call JIT::appendCallWithExceptionCheckSetJSValueResultWithProfile(const FunctionPtr function, int dst)
 {
     MacroAssembler::Call call = appendCallWithExceptionCheck(function);