Bug 1450795; r=luke

--HG--
extra : rebase_source : 923090f1b2812ca336deaf62e36706de19c74e66

js/src/wasm/WasmBuiltins.cpp

@@ -502,8 +502,8 @@ FuncCast(F* funcPtr, ABIFunctionType abiType)
     return pf;
 }
 
-void*
-wasm::AddressOf(SymbolicAddress imm, ABIFunctionType* abiType)
+static void*
+AddressOf(SymbolicAddress imm, ABIFunctionType* abiType)
 {
     switch (imm) {
       case SymbolicAddress::HandleDebugTrap:

js/src/wasm/WasmBuiltins.h

@@ -26,9 +26,6 @@ namespace wasm {
 
 class WasmFrameIter;
 
-void*
-AddressOf(SymbolicAddress sym, jit::ABIFunctionType* abiType);
-
 // A SymbolicAddress that NeedsBuiltinThunk() will call through a thunk to the
 // C++ function. This will be true for all normal calls from normal wasm
 // function code. Only calls to C++ from other exits/thunks do not need a thunk.

js/src/wasm/WasmStubs.cpp

@@ -471,9 +471,8 @@ static const Register ScratchIonEntry = ABINonArgReg2;
 static void
 CallSymbolicAddress(MacroAssembler& masm, bool isAbsolute, SymbolicAddress sym)
 {
-    ABIFunctionType _;
     if (isAbsolute)
-        masm.call(ImmPtr(AddressOf(sym, &_), ImmPtr::NoCheckToken()));
+        masm.call(ImmPtr(SymbolicAddressTarget(sym), ImmPtr::NoCheckToken()));
     else
         masm.call(sym);
 }