Skip to content

Fix misalignment issue #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix misalignment issue #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
498dfb4
reset tree to 2.4.0, now that near-vm grabbed all improvements
Ekleog-NEAR Jun 13, 2023
b0e0dd7
fix misalignment issue, backport from nearcore#9063
Ekleog-NEAR Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,415 changes: 616 additions & 799 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

112 changes: 81 additions & 31 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,32 @@ autoexamples = false
[dependencies]
wasmer = { version = "=2.4.0", path = "lib/api", package = "wasmer-near" }
wasmer-compiler = { version = "=2.4.0", path = "lib/compiler", package = "wasmer-compiler-near" }
wasmer-compiler-cranelift = { version = "2.0.0", path = "lib/compiler-cranelift", optional = true }
wasmer-compiler-singlepass = { version = "=2.4.0", path = "lib/compiler-singlepass", optional = true, package = "wasmer-compiler-singlepass-near" }
wasmer-compiler-llvm = { version = "2.0.0", path = "lib/compiler-llvm", optional = true }
wasmer-engine = { version = "=2.4.0", path = "lib/engine", package = "wasmer-engine-near" }
wasmer-engine-universal = { version = "=2.4.0", path = "lib/engine-universal", optional = true, package = "wasmer-engine-universal-near" }
wasmer-wast = { version = "2.0.0", path = "tests/lib/wast", optional = true }
wasmer-types = { version = "=2.4.0", path = "lib/types", package = "wasmer-types-near" }
wasmer-vm = { version = "=2.4.0", path = "lib/vm", package = "wasmer-vm-near" }

cfg-if = "1.0"
tracing = "0.1"

[workspace]
members = [
"lib/api",
"lib/compiler",
"lib/compiler-cranelift",
"lib/compiler-singlepass",
"lib/compiler-llvm",
"lib/derive",
"lib/engine",
"lib/engine-universal",
"lib/vm",
"lib/types",
"tests/lib/wast",
"tests/lib/compiler-test-derive",
"tests/integration/ios",
"fuzz",
]
resolver = "2"
Expand All @@ -50,16 +55,13 @@ criterion = "0.3"
lazy_static = "1.4"
serial_test = "0.5"
compiler-test-derive = { path = "tests/lib/compiler-test-derive" }
rayon = "1.5"
tempfile = "3.1"
# For logging tests using the `RUST_LOG=debug` when testing
test-log = { version = "0.2", default-features = false, features = ["trace"] }
tracing = { version = "0.1", default-features = false, features = ["log"] }
tracing-subscriber = { version = "0.3", default-features = false, features = ["env-filter", "fmt"] }
tracing-tracy = "0.9"
tracy-client = "0.13"
wat = "1.0"
wasm-encoder = "0.12"


[features]
# Don't add the compiler features in default, please add them on the Makefile
Expand All @@ -85,6 +87,29 @@ singlepass = [
"wasmer-compiler-singlepass",
"compiler",
]
cranelift = [
"wasmer-compiler-cranelift",
"compiler",
]
llvm = [
"wasmer-compiler-llvm",
"compiler",
]

# Testing features
test-singlepass = [
"singlepass",
]
test-cranelift = [
"cranelift",
]
test-llvm = [
"llvm",
]
test-universal = [
"universal",
"test-generator/test-universal",
]

# Specifies that we're running in coverage testing mode. This disables tests
# that raise signals because that interferes with tarpaulin.
Expand All @@ -98,95 +123,120 @@ name = "static_and_dynamic_functions"
harness = false

[[bench]]
name = "limits"
name = "many_functions"
harness = false

[[example]]
name = "tracy-exec"
path = "examples/tracy_exec.rs"
required-features = ["singlepass"]

[[example]]
name = "early-exit"
path = "examples/early_exit.rs"
required-features = ["singlepass"]
required-features = ["cranelift"]

[[example]]
name = "engine-universal"
path = "examples/engine_universal.rs"
required-features = ["singlepass"]
required-features = ["cranelift"]

[[example]]
name = "engine-headless"
path = "examples/engine_headless.rs"
required-features = ["cranelift"]

[[example]]
name = "platform-headless-ios"
path = "examples/platform_ios_headless.rs"
required-features = ["cranelift"]

[[example]]
name = "cross-compilation"
path = "examples/engine_cross_compilation.rs"
required-features = ["cranelift"]

[[example]]
name = "compiler-singlepass"
path = "examples/compiler_singlepass.rs"
required-features = ["singlepass"]

[[example]]
name = "compiler-cranelift"
path = "examples/compiler_cranelift.rs"
required-features = ["cranelift"]

[[example]]
name = "compiler-llvm"
path = "examples/compiler_llvm.rs"
required-features = ["llvm"]

[[example]]
name = "exported-function"
path = "examples/exports_function.rs"
required-features = ["singlepass"]
required-features = ["cranelift"]

[[example]]
name = "exported-global"
path = "examples/exports_global.rs"
required-features = ["singlepass"]
required-features = ["cranelift"]

[[example]]
name = "exported-memory"
path = "examples/exports_memory.rs"
required-features = ["singlepass"]
required-features = ["cranelift"]

[[example]]
name = "imported-function"
path = "examples/imports_function.rs"
required-features = ["singlepass"]
required-features = ["cranelift"]

[[example]]
name = "imported-global"
path = "examples/imports_global.rs"
required-features = ["singlepass"]
required-features = ["cranelift"]

[[example]]
name = "tunables-limit-memory"
path = "examples/tunables_limit_memory.rs"
required-features = ["cranelift"]

[[example]]
name = "table"
path = "examples/table.rs"
required-features = ["singlepass"]
required-features = ["cranelift"]

[[example]]
name = "memory"
path = "examples/memory.rs"
required-features = ["singlepass"]
required-features = ["cranelift"]

[[example]]
name = "instance"
path = "examples/instance.rs"
required-features = ["singlepass"]
required-features = ["cranelift"]

[[example]]
name = "errors"
path = "examples/errors.rs"
required-features = ["singlepass"]
required-features = ["cranelift"]

[[example]]
name = "imported-function-env"
path = "examples/imports_function_env.rs"
required-features = ["singlepass"]
required-features = ["cranelift"]

[[example]]
name = "hello-world"
path = "examples/hello_world.rs"
required-features = ["singlepass"]
required-features = ["cranelift"]

[[example]]
name = "metering"
path = "examples/metering.rs"
required-features = ["cranelift"]

[[example]]
name = "imports-exports"
path = "examples/imports_exports.rs"
required-features = ["singlepass"]
required-features = ["cranelift"]

[[example]]
name = "features"
path = "examples/features.rs"
required-features = ["singlepass"]

[[example]]
name = "coremark"
path = "examples/coremark.rs"
required-features = ["singlepass"]
required-features = ["cranelift"]
Loading