From 14d66b279c7e7c8df739461eafaf0a9f0c43028d Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Fri, 8 Mar 2019 17:55:51 +0100 Subject: [PATCH] Update cranelift, faerie and target-lexicon --- Cargo.lock | 149 +++++++++++++++++++++-------------------------- Cargo.toml | 11 ++-- src/debuginfo.rs | 2 +- 3 files changed, 73 insertions(+), 89 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 33f42600413..1439c42fccf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -113,119 +113,107 @@ dependencies = [ [[package]] name = "cranelift" -version = "0.28.0" -source = "git+https://github.com/CraneStation/cranelift.git#fcd566c09dd6bd13c3bed1eceac4b0378fe7cc05" +version = "0.29.0" +source = "git+https://github.com/CraneStation/cranelift.git#ccc309fc6686b2ddbc98bd03749b101be5e9ecf2" dependencies = [ - "cranelift-codegen 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", - "cranelift-frontend 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift-codegen 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift-frontend 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", ] [[package]] name = "cranelift-bforest" -version = "0.28.0" -source = "git+https://github.com/CraneStation/cranelift.git#fcd566c09dd6bd13c3bed1eceac4b0378fe7cc05" +version = "0.29.0" +source = "git+https://github.com/CraneStation/cranelift.git#ccc309fc6686b2ddbc98bd03749b101be5e9ecf2" dependencies = [ - "cranelift-entity 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift-entity 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", ] [[package]] name = "cranelift-codegen" -version = "0.28.0" -source = "git+https://github.com/CraneStation/cranelift.git#fcd566c09dd6bd13c3bed1eceac4b0378fe7cc05" +version = "0.29.0" +source = "git+https://github.com/CraneStation/cranelift.git#ccc309fc6686b2ddbc98bd03749b101be5e9ecf2" dependencies = [ - "cranelift-bforest 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", - "cranelift-codegen-meta 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", - "cranelift-entity 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift-bforest 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift-codegen-meta 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift-entity 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "target-lexicon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "cranelift-codegen-meta" -version = "0.28.0" -source = "git+https://github.com/CraneStation/cranelift.git#fcd566c09dd6bd13c3bed1eceac4b0378fe7cc05" +version = "0.29.0" +source = "git+https://github.com/CraneStation/cranelift.git#ccc309fc6686b2ddbc98bd03749b101be5e9ecf2" dependencies = [ - "cranelift-entity 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift-entity 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", ] [[package]] name = "cranelift-entity" -version = "0.28.0" -source = "git+https://github.com/CraneStation/cranelift.git#fcd566c09dd6bd13c3bed1eceac4b0378fe7cc05" +version = "0.29.0" +source = "git+https://github.com/CraneStation/cranelift.git#ccc309fc6686b2ddbc98bd03749b101be5e9ecf2" [[package]] name = "cranelift-faerie" -version = "0.28.0" -source = "git+https://github.com/CraneStation/cranelift.git#fcd566c09dd6bd13c3bed1eceac4b0378fe7cc05" +version = "0.29.0" +source = "git+https://github.com/CraneStation/cranelift.git#ccc309fc6686b2ddbc98bd03749b101be5e9ecf2" dependencies = [ - "cranelift-codegen 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", - "cranelift-module 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", - "faerie 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cranelift-codegen 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift-module 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", + "faerie 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "goblin 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", - "target-lexicon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "goblin 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "cranelift-frontend" -version = "0.28.0" -source = "git+https://github.com/CraneStation/cranelift.git#fcd566c09dd6bd13c3bed1eceac4b0378fe7cc05" +version = "0.29.0" +source = "git+https://github.com/CraneStation/cranelift.git#ccc309fc6686b2ddbc98bd03749b101be5e9ecf2" dependencies = [ - "cranelift-codegen 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift-codegen 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "target-lexicon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "cranelift-module" -version = "0.28.0" -source = "git+https://github.com/CraneStation/cranelift.git#fcd566c09dd6bd13c3bed1eceac4b0378fe7cc05" +version = "0.29.0" +source = "git+https://github.com/CraneStation/cranelift.git#ccc309fc6686b2ddbc98bd03749b101be5e9ecf2" dependencies = [ - "cranelift-codegen 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", - "cranelift-entity 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift-codegen 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift-entity 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "cranelift-native" -version = "0.28.0" -source = "git+https://github.com/CraneStation/cranelift.git#fcd566c09dd6bd13c3bed1eceac4b0378fe7cc05" +version = "0.29.0" +source = "git+https://github.com/CraneStation/cranelift.git#ccc309fc6686b2ddbc98bd03749b101be5e9ecf2" dependencies = [ - "cranelift-codegen 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift-codegen 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", "raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "target-lexicon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "cranelift-simplejit" -version = "0.28.0" -source = "git+https://github.com/CraneStation/cranelift.git#fcd566c09dd6bd13c3bed1eceac4b0378fe7cc05" +version = "0.29.0" +source = "git+https://github.com/CraneStation/cranelift.git#ccc309fc6686b2ddbc98bd03749b101be5e9ecf2" dependencies = [ - "cranelift-codegen 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", - "cranelift-module 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", - "cranelift-native 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift-codegen 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift-module 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift-native 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", "region 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "target-lexicon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "env_logger" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "env_logger" version = "0.6.1" @@ -259,19 +247,19 @@ dependencies = [ [[package]] name = "faerie" -version = "0.7.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "goblin 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "goblin 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "string-interner 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "structopt 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "structopt-derive 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "target-lexicon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -323,7 +311,7 @@ dependencies = [ [[package]] name = "goblin" -version = "0.0.19" +version = "0.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -597,16 +585,16 @@ dependencies = [ "ar 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cranelift 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", - "cranelift-faerie 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", - "cranelift-module 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", - "cranelift-simplejit 0.28.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift-faerie 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift-module 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", + "cranelift-simplejit 0.29.0 (git+https://github.com/CraneStation/cranelift.git)", "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "faerie 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "faerie 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gimli 0.17.0 (git+https://github.com/gimli-rs/gimli.git)", "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", - "target-lexicon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -731,7 +719,7 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -867,28 +855,27 @@ dependencies = [ "checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4" "checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -"checksum cranelift 0.28.0 (git+https://github.com/CraneStation/cranelift.git)" = "" -"checksum cranelift-bforest 0.28.0 (git+https://github.com/CraneStation/cranelift.git)" = "" -"checksum cranelift-codegen 0.28.0 (git+https://github.com/CraneStation/cranelift.git)" = "" -"checksum cranelift-codegen-meta 0.28.0 (git+https://github.com/CraneStation/cranelift.git)" = "" -"checksum cranelift-entity 0.28.0 (git+https://github.com/CraneStation/cranelift.git)" = "" -"checksum cranelift-faerie 0.28.0 (git+https://github.com/CraneStation/cranelift.git)" = "" -"checksum cranelift-frontend 0.28.0 (git+https://github.com/CraneStation/cranelift.git)" = "" -"checksum cranelift-module 0.28.0 (git+https://github.com/CraneStation/cranelift.git)" = "" -"checksum cranelift-native 0.28.0 (git+https://github.com/CraneStation/cranelift.git)" = "" -"checksum cranelift-simplejit 0.28.0 (git+https://github.com/CraneStation/cranelift.git)" = "" -"checksum env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)" = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" +"checksum cranelift 0.29.0 (git+https://github.com/CraneStation/cranelift.git)" = "" +"checksum cranelift-bforest 0.29.0 (git+https://github.com/CraneStation/cranelift.git)" = "" +"checksum cranelift-codegen 0.29.0 (git+https://github.com/CraneStation/cranelift.git)" = "" +"checksum cranelift-codegen-meta 0.29.0 (git+https://github.com/CraneStation/cranelift.git)" = "" +"checksum cranelift-entity 0.29.0 (git+https://github.com/CraneStation/cranelift.git)" = "" +"checksum cranelift-faerie 0.29.0 (git+https://github.com/CraneStation/cranelift.git)" = "" +"checksum cranelift-frontend 0.29.0 (git+https://github.com/CraneStation/cranelift.git)" = "" +"checksum cranelift-module 0.29.0 (git+https://github.com/CraneStation/cranelift.git)" = "" +"checksum cranelift-native 0.29.0 (git+https://github.com/CraneStation/cranelift.git)" = "" +"checksum cranelift-simplejit 0.29.0 (git+https://github.com/CraneStation/cranelift.git)" = "" "checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a" "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 faerie 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "142ee8f6d2864117a92855815e710b03087763df41ab3c6a97ca25e00e178b98" +"checksum faerie 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f48412f92b56015a240e249847295b38b0a731435806c21a199403b2c317272c" "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" "checksum fallible-iterator 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eb7217124812dc5672b7476d0c2d20cfe9f7c0f1ba0904b674a9762a0212f72e" "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 gimli 0.17.0 (git+https://github.com/gimli-rs/gimli.git)" = "" -"checksum goblin 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "c65cd533b33e3d04c6e393225fa8919ddfcf5862ca8919c7f9a167c312ef41c2" +"checksum goblin 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6a4013e9182f2345c6b7829b9ef6e670bce0dfca12c6f974457ed2160c2c7fe9" "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" "checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" "checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d" @@ -937,7 +924,7 @@ dependencies = [ "checksum structopt-derive 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ef98172b1a00b0bec738508d3726540edcbd186d50dfd326f2b1febbb3559f04" "checksum syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)" = "525bd55255f03c816e5d7f615587bd13030c7103354fadb104993dcee6a788ec" "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" -"checksum target-lexicon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4af5e2227f0b887d591d3724b796a96eff04226104d872f5b3883fcd427d64b9" +"checksum target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6923974ce4eb5bd28814756256d8ab71c28dd6e7483313fe7ab6614306bf633" "checksum tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b86c784c88d98c801132806dadd3819ed29d8600836c4088e855cdf3e178ed8a" "checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" diff --git a/Cargo.toml b/Cargo.toml index 40860ef58c7..b447ef5d5d1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,16 +10,14 @@ edition = "2018" crate-type = ["dylib"] [dependencies] -#cranelift = "0.14.0" -#cranelift-module = "0.14.0" -#cranelift-simplejit = "0.14.0" -#cranelift-faerie = "0.14.0" - +# These have to be in sync with each other cranelift = { git = "https://github.com/CraneStation/cranelift.git" } cranelift-module = { git = "https://github.com/CraneStation/cranelift.git" } cranelift-simplejit = { git = "https://github.com/CraneStation/cranelift.git" } cranelift-faerie = { git = "https://github.com/CraneStation/cranelift.git" } -target-lexicon = "0.2.0" +target-lexicon = "0.3.0" +faerie = "0.9.1" + #goblin = "0.0.17" ar = "0.6.1" bitflags = "1.0.3" @@ -28,7 +26,6 @@ libc = "0.2.50" tempfile = "3.0.7" env_logger = "0.6" gimli = { git = "https://github.com/gimli-rs/gimli.git" } -faerie = "0.7.1" indexmap = "1.0.2" # Uncomment to use local checkout of cranelift diff --git a/src/debuginfo.rs b/src/debuginfo.rs index 35b8369d8a5..8537e8b7205 100644 --- a/src/debuginfo.rs +++ b/src/debuginfo.rs @@ -191,7 +191,7 @@ impl<'a, 'tcx: 'a> DebugContext<'tcx> { let _: Result<()> = sections.for_each_mut(|id, section| { if !section.writer.slice().is_empty() { artifact - .declare_with(id.name(), Decl::DebugSection, section.writer.take()) + .declare_with(id.name(), Decl::debug_section(), section.writer.take()) .unwrap(); } Ok(())