Bug 1754018 - Make cranelift compile again. r=yury

A field is removed from FuncType because it is never used and current rustc throws an error for this. A name change coming from the call_indirect work is propagated into WasmCraneliftCompile.cpp. Differential Revision: https://phabricator.services.mozilla.com/D138053
dothq · Feb 9, 2022 · 2a5a24a · 2a5a24a
1 parent f5670ff
commit 2a5a24a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/js/src/wasm/WasmCraneliftCompile.cpp b/js/src/wasm/WasmCraneliftCompile.cpp
@@ -249,7 +249,7 @@ static bool GenerateCraneliftCode(
         break;
       }
       case CraneliftMetadataEntry::Which::IndirectCall: {
-        CallSiteDesc desc(bytecodeOffset, CallSiteDesc::Dynamic);
+        CallSiteDesc desc(bytecodeOffset, CallSiteDesc::Indirect);
         masm.append(desc, CodeOffset(offset.value()));
         break;
       }

diff --git a/js/src/wasm/cranelift/src/bindings/mod.rs b/js/src/wasm/cranelift/src/bindings/mod.rs
@@ -161,7 +161,6 @@ impl TableDesc {
 
 #[derive(Clone)]
 pub struct FuncType {
-    ptr: *const low_level::FuncType,
     args: Vec<TypeCode>,
     results: Vec<TypeCode>,
 }
@@ -184,7 +183,7 @@ impl FuncType {
             .map(|val_type| unsafe { low_level::env_unpack(*val_type) })
             .collect();
 
-        Self { ptr, args, results }
+        Self { args, results }
     }
 
     pub(crate) fn args(&self) -> &[TypeCode] {