fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-19 03:41:22 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ivan Enderlin
2019-11-06 14:37:06 +01:00
parent 6f84a6f15b 07a6fde420
commit cf74b68c37
5 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Cargo.lock generated
View File

@ -434,7 +434,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "generational-arena" name = "generational-arena"
version = "0.2.3" version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@ -522,7 +522,7 @@ dependencies = [
[[package]] [[package]]
name = "inkwell" name = "inkwell"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/wasmerio/inkwell?branch=llvm8-0#10d180807ce6e621ae13d74001bf5677b0e1f179" source = "git+https://github.com/wasmerio/inkwell?branch=llvm8-0#bd0d09a8041dc2217f698cd3631b6d4d4c0e696b"
dependencies = [ dependencies = [
"either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"enum-methods 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "enum-methods 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -536,7 +536,7 @@ dependencies = [
[[package]] [[package]]
name = "inkwell_internal_macros" name = "inkwell_internal_macros"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/wasmerio/inkwell?branch=llvm8-0#10d180807ce6e621ae13d74001bf5677b0e1f179" source = "git+https://github.com/wasmerio/inkwell?branch=llvm8-0#bd0d09a8041dc2217f698cd3631b6d4d4c0e696b"
dependencies = [ dependencies = [
"cargo_toml 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "cargo_toml 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1590,7 +1590,7 @@ version = "0.9.0"
dependencies = [ dependencies = [
"bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"generational-arena 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "generational-arena 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1717,7 +1717,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum field-offset 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "64e9bc339e426139e02601fa69d101e96a92aee71b58bc01697ec2a63a5c9e68" "checksum field-offset 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "64e9bc339e426139e02601fa69d101e96a92aee71b58bc01697ec2a63a5c9e68"
"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" "checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
"checksum generational-arena 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "921c3803adaeb9f9639de5149d9f0f9f4b79f00c423915b701db2e02ed80b9ce" "checksum generational-arena 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fd04ad33021a0409d3f1afbfb89d9f02c10caee73c28f5ac197474dd53e7cf7c"
"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" "checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
"checksum ghost 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a36606a68532b5640dc86bb1f33c64b45c4682aad4c50f3937b317ea387f3d6" "checksum ghost 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a36606a68532b5640dc86bb1f33c64b45c4682aad4c50f3937b317ea387f3d6"

3
Makefile
View File

@ -60,8 +60,7 @@ middleware-cranelift:
cargo test --manifest-path lib/middleware-common-tests/Cargo.toml --release --features clif cargo test --manifest-path lib/middleware-common-tests/Cargo.toml --release --features clif
middleware-llvm: 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
cargo test --manifest-path lib/middleware-common-tests/Cargo.toml --release --features llvm -- --test-threads=1
middleware: middleware-singlepass middleware-cranelift middleware-llvm middleware: middleware-singlepass middleware-cranelift middleware-llvm

8
lib/llvm-backend/src/intrinsics.rs
View File

@ -8,7 +8,7 @@ use inkwell::{
}, },
values::{ values::{
BasicValue, BasicValueEnum, FloatValue, FunctionValue, InstructionValue, IntValue, BasicValue, BasicValueEnum, FloatValue, FunctionValue, InstructionValue, IntValue,
MetadataValue, PointerValue, VectorValue, PointerValue, VectorValue,
}, },
AddressSpace, AddressSpace,
}; };
@ -1218,7 +1218,7 @@ pub fn tbaa_label(
.get_global_metadata("wasmer_tbaa_root") .get_global_metadata("wasmer_tbaa_root")
.pop() .pop()
.unwrap_or_else(|| { .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] module.get_global_metadata("wasmer_tbaa_root")[0]
}); });
@ -1236,7 +1236,7 @@ pub fn tbaa_label(
.unwrap_or_else(|| { .unwrap_or_else(|| {
module.add_global_metadata( module.add_global_metadata(
label.as_str(), 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] module.get_global_metadata(label.as_str())[0]
}); });
@ -1254,7 +1254,7 @@ pub fn tbaa_label(
.unwrap_or_else(|| { .unwrap_or_else(|| {
module.add_global_metadata( module.add_global_metadata(
label.as_str(), label.as_str(),
&MetadataValue::create_node(&[ &context.metadata_node(&[
type_tbaa.into(), type_tbaa.into(),
type_tbaa.into(), type_tbaa.into(),
intrinsics.i64_zero.into(), intrinsics.i64_zero.into(),

2
lib/runtime-core/src/fault.rs
View File

@ -290,7 +290,7 @@ extern "C" fn signal_trap_handler(
); );
es_image.print_backtrace_if_needed(); es_image.print_backtrace_if_needed();
} }
// Just let the error propagate otherrwise // Just let the error propagate otherwise
} }
true true

56
lib/wasi/src/syscalls/types.rs
View File

@ -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_SIZE: u64 = 1 << 22;
pub const __WASI_RIGHT_FD_FILESTAT_SET_TIMES: u64 = 1 << 23; 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_SYMLINK: u64 = 1 << 24;
pub const __WASI_RIGHT_PATH_UNLINK_FILE: u64 = 1 << 25; pub const __WASI_RIGHT_PATH_REMOVE_DIRECTORY: u64 = 1 << 25;
pub const __WASI_RIGHT_PATH_REMOVE_DIRECTORY: u64 = 1 << 26; pub const __WASI_RIGHT_PATH_UNLINK_FILE: u64 = 1 << 26;
pub const __WASI_RIGHT_POLL_FD_READWRITE: u64 = 1 << 27; pub const __WASI_RIGHT_POLL_FD_READWRITE: u64 = 1 << 27;
pub const __WASI_RIGHT_SOCK_SHUTDOWN: u64 = 1 << 28; 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_siflags_t = u16;
pub type __wasi_signal_t = u8; pub type __wasi_signal_t = u8;
pub const __WASI_SIGABRT: u8 = 0; pub const __WASI_SIGHUP: u8 = 1;
pub const __WASI_SIGALRM: u8 = 1; pub const __WASI_SIGINT: u8 = 2;
pub const __WASI_SIGBUS: u8 = 2; pub const __WASI_SIGQUIT: u8 = 3;
pub const __WASI_SIGCHLD: u8 = 3; pub const __WASI_SIGILL: u8 = 4;
pub const __WASI_SIGCONT: u8 = 4; pub const __WASI_SIGTRAP: u8 = 5;
pub const __WASI_SIGFPE: u8 = 5; pub const __WASI_SIGABRT: u8 = 6;
pub const __WASI_SIGHUP: u8 = 6; pub const __WASI_SIGBUS: u8 = 7;
pub const __WASI_SIGILL: u8 = 7; pub const __WASI_SIGFPE: u8 = 8;
pub const __WASI_SIGINT: u8 = 8;
pub const __WASI_SIGKILL: u8 = 9; pub const __WASI_SIGKILL: u8 = 9;
pub const __WASI_SIGPIPE: u8 = 10; pub const __WASI_SIGUSR1: u8 = 10;
pub const __WASI_SIGQUIT: u8 = 11; pub const __WASI_SIGSEGV: u8 = 11;
pub const __WASI_SIGSEGV: u8 = 12; pub const __WASI_SIGUSR2: u8 = 12;
pub const __WASI_SIGSTOP: u8 = 13; pub const __WASI_SIGPIPE: u8 = 13;
pub const __WASI_SIGSYS: u8 = 14; pub const __WASI_SIGALRM: u8 = 14;
pub const __WASI_SIGTERM: u8 = 15; pub const __WASI_SIGTERM: u8 = 15;
pub const __WASI_SIGTRAP: u8 = 16; pub const __WASI_SIGCHLD: u8 = 16;
pub const __WASI_SIGTSTP: u8 = 17; pub const __WASI_SIGCONT: u8 = 17;
pub const __WASI_SIGTTIN: u8 = 18; pub const __WASI_SIGSTOP: u8 = 18;
pub const __WASI_SIGTTOU: u8 = 19; pub const __WASI_SIGTSTP: u8 = 19;
pub const __WASI_SIGURG: u8 = 20; pub const __WASI_SIGTTIN: u8 = 20;
pub const __WASI_SIGUSR1: u8 = 21; pub const __WASI_SIGTTOU: u8 = 21;
pub const __WASI_SIGUSR2: u8 = 22; pub const __WASI_SIGURG: u8 = 22;
pub const __WASI_SIGVTALRM: u8 = 23; pub const __WASI_SIGXCPU: u8 = 23;
pub const __WASI_SIGXCPU: u8 = 24; pub const __WASI_SIGXFSZ: u8 = 24;
pub const __WASI_SIGXFSZ: u8 = 25; 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 type __wasi_subclockflags_t = u16;
pub const __WASI_SUBSCRIPTION_CLOCK_ABSTIME: u16 = 1 << 0; pub const __WASI_SUBSCRIPTION_CLOCK_ABSTIME: u16 = 1 << 0;