Merge wasmerio#931

931: Build Metadata using the current Context. r=nlewycky a=nlewycky Fixes wasmerio#927. Reverts wasmerio#928. Co-authored-by: Nick Lewycky <[email protected]>
deepkn · Nov 5, 2019 · 5f9670f · 5f9670f
2 parents bbcccaf + 1d8f2b7
commit 5f9670f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -60,8 +60,7 @@ middleware-cranelift:
 	cargo test --manifest-path lib/middleware-common-tests/Cargo.toml --release --features clif
 
 middleware-llvm:
-# TODO: remove workaround for https://github.com/wasmerio/wasmer/issues/927
-	cargo test --manifest-path lib/middleware-common-tests/Cargo.toml --release --features llvm -- --test-threads=1
+	cargo test --manifest-path lib/middleware-common-tests/Cargo.toml --release --features llvm
 
 middleware: middleware-singlepass middleware-cranelift middleware-llvm
 

diff --git a/lib/llvm-backend/src/intrinsics.rs b/lib/llvm-backend/src/intrinsics.rs
@@ -8,7 +8,7 @@ use inkwell::{
     },
     values::{
         BasicValue, BasicValueEnum, FloatValue, FunctionValue, InstructionValue, IntValue,
-        MetadataValue, PointerValue, VectorValue,
+        PointerValue, VectorValue,
     },
     AddressSpace,
 };
@@ -1218,7 +1218,7 @@ pub fn tbaa_label(
         .get_global_metadata("wasmer_tbaa_root")
         .pop()
         .unwrap_or_else(|| {
-            module.add_global_metadata("wasmer_tbaa_root", &MetadataValue::create_node(&[]));
+            module.add_global_metadata("wasmer_tbaa_root", &context.metadata_node(&[]));
             module.get_global_metadata("wasmer_tbaa_root")[0]
         });
 
@@ -1236,7 +1236,7 @@ pub fn tbaa_label(
         .unwrap_or_else(|| {
             module.add_global_metadata(
                 label.as_str(),
-                &MetadataValue::create_node(&[type_label.into(), tbaa_root.into()]),
+                &context.metadata_node(&[type_label.into(), tbaa_root.into()]),
             );
             module.get_global_metadata(label.as_str())[0]
         });
@@ -1254,7 +1254,7 @@ pub fn tbaa_label(
         .unwrap_or_else(|| {
             module.add_global_metadata(
                 label.as_str(),
-                &MetadataValue::create_node(&[
+                &context.metadata_node(&[
                     type_tbaa.into(),
                     type_tbaa.into(),
                     intrinsics.i64_zero.into(),