From 24fd604540316786e7f7780fa6da2dc53248b746 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Wed, 22 Jan 2020 18:04:11 +0100 Subject: [PATCH] Update Cranelift As basic blocks now work, they are enabled. --- Cargo.lock | 61 +++++++++++++++++++++++++++++++++++++++++++++--------- Cargo.toml | 8 +++---- 2 files changed, 55 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e93e5a6b114..a62148c4f0b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,6 +5,14 @@ name = "ar" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "arrayvec" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "autocfg" version = "0.1.7" @@ -33,7 +41,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cranelift-bforest" version = "0.56.0" -source = "git+https://github.com/bytecodealliance/cranelift/#062e984cddb39bfe41f3abcb4653e76670960a69" +source = "git+https://github.com/bytecodealliance/cranelift/#93e3bc19985d0be2d0bfb7bcf990139c4a95358d" dependencies = [ "cranelift-entity 0.56.0 (git+https://github.com/bytecodealliance/cranelift/)", ] @@ -41,13 +49,14 @@ dependencies = [ [[package]] name = "cranelift-codegen" version = "0.56.0" -source = "git+https://github.com/bytecodealliance/cranelift/#062e984cddb39bfe41f3abcb4653e76670960a69" +source = "git+https://github.com/bytecodealliance/cranelift/#93e3bc19985d0be2d0bfb7bcf990139c4a95358d" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift-bforest 0.56.0 (git+https://github.com/bytecodealliance/cranelift/)", "cranelift-codegen-meta 0.56.0 (git+https://github.com/bytecodealliance/cranelift/)", "cranelift-codegen-shared 0.56.0 (git+https://github.com/bytecodealliance/cranelift/)", "cranelift-entity 0.56.0 (git+https://github.com/bytecodealliance/cranelift/)", + "gimli 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "target-lexicon 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -57,7 +66,7 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" version = "0.56.0" -source = "git+https://github.com/bytecodealliance/cranelift/#062e984cddb39bfe41f3abcb4653e76670960a69" +source = "git+https://github.com/bytecodealliance/cranelift/#93e3bc19985d0be2d0bfb7bcf990139c4a95358d" dependencies = [ "cranelift-codegen-shared 0.56.0 (git+https://github.com/bytecodealliance/cranelift/)", "cranelift-entity 0.56.0 (git+https://github.com/bytecodealliance/cranelift/)", @@ -66,17 +75,17 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" version = "0.56.0" -source = "git+https://github.com/bytecodealliance/cranelift/#062e984cddb39bfe41f3abcb4653e76670960a69" +source = "git+https://github.com/bytecodealliance/cranelift/#93e3bc19985d0be2d0bfb7bcf990139c4a95358d" [[package]] name = "cranelift-entity" version = "0.56.0" -source = "git+https://github.com/bytecodealliance/cranelift/#062e984cddb39bfe41f3abcb4653e76670960a69" +source = "git+https://github.com/bytecodealliance/cranelift/#93e3bc19985d0be2d0bfb7bcf990139c4a95358d" [[package]] name = "cranelift-frontend" version = "0.56.0" -source = "git+https://github.com/bytecodealliance/cranelift/#062e984cddb39bfe41f3abcb4653e76670960a69" +source = "git+https://github.com/bytecodealliance/cranelift/#93e3bc19985d0be2d0bfb7bcf990139c4a95358d" dependencies = [ "cranelift-codegen 0.56.0 (git+https://github.com/bytecodealliance/cranelift/)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -87,7 +96,7 @@ dependencies = [ [[package]] name = "cranelift-module" version = "0.56.0" -source = "git+https://github.com/bytecodealliance/cranelift/#062e984cddb39bfe41f3abcb4653e76670960a69" +source = "git+https://github.com/bytecodealliance/cranelift/#93e3bc19985d0be2d0bfb7bcf990139c4a95358d" dependencies = [ "cranelift-codegen 0.56.0 (git+https://github.com/bytecodealliance/cranelift/)", "cranelift-entity 0.56.0 (git+https://github.com/bytecodealliance/cranelift/)", @@ -98,7 +107,7 @@ dependencies = [ [[package]] name = "cranelift-native" version = "0.56.0" -source = "git+https://github.com/bytecodealliance/cranelift/#062e984cddb39bfe41f3abcb4653e76670960a69" +source = "git+https://github.com/bytecodealliance/cranelift/#93e3bc19985d0be2d0bfb7bcf990139c4a95358d" dependencies = [ "cranelift-codegen 0.56.0 (git+https://github.com/bytecodealliance/cranelift/)", "raw-cpuid 7.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -108,7 +117,7 @@ dependencies = [ [[package]] name = "cranelift-object" version = "0.56.0" -source = "git+https://github.com/bytecodealliance/cranelift/#062e984cddb39bfe41f3abcb4653e76670960a69" +source = "git+https://github.com/bytecodealliance/cranelift/#93e3bc19985d0be2d0bfb7bcf990139c4a95358d" dependencies = [ "cranelift-codegen 0.56.0 (git+https://github.com/bytecodealliance/cranelift/)", "cranelift-module 0.56.0 (git+https://github.com/bytecodealliance/cranelift/)", @@ -119,7 +128,7 @@ dependencies = [ [[package]] name = "cranelift-simplejit" version = "0.56.0" -source = "git+https://github.com/bytecodealliance/cranelift/#062e984cddb39bfe41f3abcb4653e76670960a69" +source = "git+https://github.com/bytecodealliance/cranelift/#93e3bc19985d0be2d0bfb7bcf990139c4a95358d" dependencies = [ "cranelift-codegen 0.56.0 (git+https://github.com/bytecodealliance/cranelift/)", "cranelift-module 0.56.0 (git+https://github.com/bytecodealliance/cranelift/)", @@ -158,11 +167,28 @@ dependencies = [ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "gcc" version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "gimli" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "gimli" version = "0.20.0" @@ -220,6 +246,11 @@ dependencies = [ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "object" version = "0.17.0" @@ -337,6 +368,11 @@ name = "smallvec" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "stable_deref_trait" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "syn" version = "1.0.13" @@ -401,6 +437,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [metadata] "checksum ar 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "450575f58f7bee32816abbff470cbc47797397c2a81e0eaced4b98436daf52e1" +"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" @@ -419,7 +456,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" "checksum errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2a071601ed01b988f896ab14b95e67335d1eeb50190932a1320f7fe3cadc84e" "checksum errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067" +"checksum fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" "checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" +"checksum gimli 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "162d18ae5f2e3b90a993d202f1ba17a5633c2484426f8bcae201f86194bacd00" "checksum gimli 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "81dd6190aad0f05ddbbf3245c54ed14ca4aa6dd32f22312b70d8f168c3e3e633" "checksum goblin 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3081214398d39e4bd7f2c1975f0488ed04614ffdd976c6fc7a0708278552c0da" "checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" @@ -427,6 +466,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" "checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" +"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" "checksum object 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea44a4fd660ab0f38434934ca0212e90fbeaaee54126ef20a3451c30c95bafae" "checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" "checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc" @@ -439,6 +479,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" "checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4" +"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8" "checksum target-lexicon 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab0e7238dcc7b40a7be719a25365910f6807bd864f4cce6b2e6b873658e2b19d" "checksum thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6f357d1814b33bc2dc221243f8424104bfe72dbe911d5b71b3816a2dff1c977e" diff --git a/Cargo.toml b/Cargo.toml index c4fca7f7c76..8e4cff5c1eb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,8 +9,8 @@ crate-type = ["dylib"] [dependencies] # These have to be in sync with each other -cranelift-codegen = { git = "https://github.com/bytecodealliance/cranelift/", default-features = false, features = ["std"] } -cranelift-frontend = { git = "https://github.com/bytecodealliance/cranelift/", default-features = false, features = ["std"] } +cranelift-codegen = { git = "https://github.com/bytecodealliance/cranelift/" } +cranelift-frontend = { git = "https://github.com/bytecodealliance/cranelift/" } cranelift-module = { git = "https://github.com/bytecodealliance/cranelift/" } cranelift-object = { git = "https://github.com/bytecodealliance/cranelift/" } target-lexicon = "0.10.0" @@ -31,8 +31,8 @@ features = ["write"] # We don't need read support # Uncomment to use local checkout of cranelift #[patch."https://github.com/bytecodealliance/cranelift/"] -#cranelift-codegen = { path = "../cranelift/cranelift-codegen", default-features = false, features = ["std"] } -#cranelift-frontend = { path = "../cranelift/cranelift-frontend", default-features = false, features = ["std"] } +#cranelift-codegen = { path = "../cranelift/cranelift-codegen" } +#cranelift-frontend = { path = "../cranelift/cranelift-frontend" } #cranelift-module = { path = "../cranelift/cranelift-module" } #cranelift-simplejit = { path = "../cranelift/cranelift-simplejit" } #cranelift-object = { path = "../cranelift/cranelift-object" }