Fix failing tests

rustwasm · Sep 1, 2019 · f7d1428 · f7d1428
1 parent 0aa19af
commit f7d1428
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/crates/backend/src/codegen.rs b/crates/backend/src/codegen.rs
@@ -1064,7 +1064,7 @@ impl TryToTokens for ast::ImportFunction {
             &self.rust_name,
         );
 
-        let const_name = encode::lookup_constant_for_fn(&self.rust_name);
+        let const_name = encode::lookup_constant_for_fn(rust_name);
         let id_bytes = gen_id();
 
         let invocation = quote! {

diff --git a/crates/backend/src/encode.rs b/crates/backend/src/encode.rs
@@ -12,7 +12,13 @@ use crate::Diagnostic;
 
 pub fn lookup_constant_for_fn(ident: &Ident) -> Ident {
     Ident::new(
-        &format!("__WASM_BINDGEN_GENERATED_{}", ident.to_string().to_uppercase()),
+        &format!(
+            "__WASM_BINDGEN_GENERATED_{}",
+            ident
+                .to_string()
+                .trim_start_matches(&"r#")
+                .to_uppercase()
+        ),
         Span::call_site()
     )
 }

diff --git a/crates/backend/src/util.rs b/crates/backend/src/util.rs
@@ -142,6 +142,9 @@ impl<T: Hash> fmt::Display for ShortHash<T> {
             env::var("CARGO_PKG_VERSION")
                 .expect("should have CARGO_PKG_VERSION env var")
                 .hash(&mut h);
+
+            std::time::SystemTime::now().hash(&mut h);
+
             // This may chop off 32 bits on 32-bit platforms, but that's ok, we
             // just want something to mix in below anyway.
             HASH.store(h.finish() as usize, SeqCst);

diff --git a/crates/cli-support/src/js/mod.rs b/crates/cli-support/src/js/mod.rs
@@ -185,12 +185,21 @@ impl<'a> Context<'a> {
             }
 
             self.expose_export_map();
-            self.expose_add_heap_object();
-            self.global(&format!(
-                "EXPORT_MAP[\"{}\"] = addHeapObject({});\n",
-                result.into_iter().collect::<String>(),
-                definition_name,
-            ));
+            if self.config.anyref {
+                self.expose_add_to_anyref_table();
+                self.global(&format!(
+                    "EXPORT_MAP[\"{}\"] = addToAnyrefTable({});\n",
+                    result.into_iter().collect::<String>(),
+                    definition_name,
+                ));
+            } else {
+                self.expose_add_heap_object();
+                self.global(&format!(
+                    "EXPORT_MAP[\"{}\"] = addHeapObject({});\n",
+                    result.into_iter().collect::<String>(),
+                    definition_name,
+                ));
+            }
         }
         Ok(())
     }