Merge branch 'master' into feat-runtime-core-clos-host-function

Hywan · Nov 6, 2019 · cf74b68 · cf74b68
2 parents 6f84a6f + 07a6fde
commit cf74b68
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 38 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(),

diff --git a/lib/runtime-core/src/fault.rs b/lib/runtime-core/src/fault.rs
@@ -290,7 +290,7 @@ extern "C" fn signal_trap_handler(
                     );
                     es_image.print_backtrace_if_needed();
                 }
-                // Just let the error propagate otherrwise
+                // Just let the error propagate otherwise
             }
 
             true

diff --git a/lib/wasi/src/syscalls/types.rs b/lib/wasi/src/syscalls/types.rs
@@ -457,8 +457,8 @@ pub const __WASI_RIGHT_FD_FILESTAT_GET: u64 = 1 << 21;
 pub const __WASI_RIGHT_FD_FILESTAT_SET_SIZE: u64 = 1 << 22;
 pub const __WASI_RIGHT_FD_FILESTAT_SET_TIMES: u64 = 1 << 23;
 pub const __WASI_RIGHT_PATH_SYMLINK: u64 = 1 << 24;
-pub const __WASI_RIGHT_PATH_UNLINK_FILE: u64 = 1 << 25;
-pub const __WASI_RIGHT_PATH_REMOVE_DIRECTORY: u64 = 1 << 26;
+pub const __WASI_RIGHT_PATH_REMOVE_DIRECTORY: u64 = 1 << 25;
+pub const __WASI_RIGHT_PATH_UNLINK_FILE: u64 = 1 << 26;
 pub const __WASI_RIGHT_POLL_FD_READWRITE: u64 = 1 << 27;
 pub const __WASI_RIGHT_SOCK_SHUTDOWN: u64 = 1 << 28;
 
@@ -522,32 +522,36 @@ pub const __WASI_SHUT_WR: u8 = 1 << 1;
 pub type __wasi_siflags_t = u16;
 
 pub type __wasi_signal_t = u8;
-pub const __WASI_SIGABRT: u8 = 0;
-pub const __WASI_SIGALRM: u8 = 1;
-pub const __WASI_SIGBUS: u8 = 2;
-pub const __WASI_SIGCHLD: u8 = 3;
-pub const __WASI_SIGCONT: u8 = 4;
-pub const __WASI_SIGFPE: u8 = 5;
-pub const __WASI_SIGHUP: u8 = 6;
-pub const __WASI_SIGILL: u8 = 7;
-pub const __WASI_SIGINT: u8 = 8;
+pub const __WASI_SIGHUP: u8 = 1;
+pub const __WASI_SIGINT: u8 = 2;
+pub const __WASI_SIGQUIT: u8 = 3;
+pub const __WASI_SIGILL: u8 = 4;
+pub const __WASI_SIGTRAP: u8 = 5;
+pub const __WASI_SIGABRT: u8 = 6;
+pub const __WASI_SIGBUS: u8 = 7;
+pub const __WASI_SIGFPE: u8 = 8;
 pub const __WASI_SIGKILL: u8 = 9;
-pub const __WASI_SIGPIPE: u8 = 10;
-pub const __WASI_SIGQUIT: u8 = 11;
-pub const __WASI_SIGSEGV: u8 = 12;
-pub const __WASI_SIGSTOP: u8 = 13;
-pub const __WASI_SIGSYS: u8 = 14;
+pub const __WASI_SIGUSR1: u8 = 10;
+pub const __WASI_SIGSEGV: u8 = 11;
+pub const __WASI_SIGUSR2: u8 = 12;
+pub const __WASI_SIGPIPE: u8 = 13;
+pub const __WASI_SIGALRM: u8 = 14;
 pub const __WASI_SIGTERM: u8 = 15;
-pub const __WASI_SIGTRAP: u8 = 16;
-pub const __WASI_SIGTSTP: u8 = 17;
-pub const __WASI_SIGTTIN: u8 = 18;
-pub const __WASI_SIGTTOU: u8 = 19;
-pub const __WASI_SIGURG: u8 = 20;
-pub const __WASI_SIGUSR1: u8 = 21;
-pub const __WASI_SIGUSR2: u8 = 22;
-pub const __WASI_SIGVTALRM: u8 = 23;
-pub const __WASI_SIGXCPU: u8 = 24;
-pub const __WASI_SIGXFSZ: u8 = 25;
+pub const __WASI_SIGCHLD: u8 = 16;
+pub const __WASI_SIGCONT: u8 = 17;
+pub const __WASI_SIGSTOP: u8 = 18;
+pub const __WASI_SIGTSTP: u8 = 19;
+pub const __WASI_SIGTTIN: u8 = 20;
+pub const __WASI_SIGTTOU: u8 = 21;
+pub const __WASI_SIGURG: u8 = 22;
+pub const __WASI_SIGXCPU: u8 = 23;
+pub const __WASI_SIGXFSZ: u8 = 24;
+pub const __WASI_SIGVTALRM: u8 = 25;
+pub const __WASI_SIGPROF: u8 = 26;
+pub const __WASI_SIGWINCH: u8 = 27;
+pub const __WASI_SIGPOLL: u8 = 28;
+pub const __WASI_SIGPWR: u8 = 29;
+pub const __WASI_SIGSYS: u8 = 30;
 
 pub type __wasi_subclockflags_t = u16;
 pub const __WASI_SUBSCRIPTION_CLOCK_ABSTIME: u16 = 1 << 0;
-Original file line number
+Diff line change
@@ Expand Up / @@ -290,7 +290,7 @@ extern "C" fn signal_trap_handler( @@
                         );
                         es_image.print_backtrace_if_needed();
                     }
-                    // Just let the error propagate otherrwise
+                    // Just let the error propagate otherwise
                 }
                 true
@@ Expand Down @@