Bug 1523993: Expose AddressOf in WasmBuiltins.h; r=bustage
authorBenjamin Bouvier <benj@benj.me>
Thu, 07 Feb 2019 11:56:10 +0100
changeset 515437 b9d7ef0c0e5d
parent 515436 de9bc20a8ed5
child 515438 1986c84c8302
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1523993
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1523993: Expose AddressOf in WasmBuiltins.h; r=bustage
js/src/wasm/WasmBuiltins.cpp
js/src/wasm/WasmBuiltins.h
--- a/js/src/wasm/WasmBuiltins.cpp
+++ b/js/src/wasm/WasmBuiltins.cpp
@@ -489,17 +489,17 @@ void wasm::PrintF64(double val)
 }
 
 void wasm::PrintText(const char* out)
 {
   fprintf(stderr, "%s", out);
 }
 #endif
 
-static void* AddressOf(SymbolicAddress imm, ABIFunctionType* abiType) {
+void* wasm::AddressOf(SymbolicAddress imm, ABIFunctionType* abiType) {
   switch (imm) {
     case SymbolicAddress::HandleDebugTrap:
       *abiType = Args_General0;
       return FuncCast(WasmHandleDebugTrap, *abiType);
     case SymbolicAddress::HandleThrow:
       *abiType = Args_General0;
       return FuncCast(WasmHandleThrow, *abiType);
     case SymbolicAddress::HandleTrap:
--- a/js/src/wasm/WasmBuiltins.h
+++ b/js/src/wasm/WasmBuiltins.h
@@ -50,16 +50,18 @@ bool EnsureBuiltinThunksInitialized();
 void* HandleThrow(JSContext* cx, WasmFrameIter& iter);
 
 void* SymbolicAddressTarget(SymbolicAddress sym);
 
 void* MaybeGetBuiltinThunk(HandleFunction f, const FuncType& funcType);
 
 void ReleaseBuiltinThunks();
 
+void* AddressOf(SymbolicAddress imm, jit::ABIFunctionType* abiType);
+
 #ifdef WASM_CODEGEN_DEBUG
 void PrintI32(int32_t val);
 void PrintF32(float val);
 void PrintF64(double val);
 void PrintPtr(uint8_t* val);
 void PrintText(const char* out);
 #endif