Skip to content

[beta] backports #77705

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

Merged
merged 13 commits into from
Oct 8, 2020
Merged

[beta] backports #77705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bfef674
Bump to released compiler
Mark-Simulacrum Oct 8, 2020
e9d0e3c
bootstrap: add ./x.py run src/tools/build-manifest
pietroalbini Sep 30, 2020
799c5b6
build-manifest: keep legacy behavior when invoking through ./x.py dist
pietroalbini Sep 30, 2020
a7c8e79
build-manifest: split the manifest struct definition in a separate file
pietroalbini Sep 30, 2020
d43d717
build-manifest: move generating a target to the manifest mod
pietroalbini Oct 1, 2020
cfc8d81
build-manifest: calculate checksums lazily and in parallel
pietroalbini Oct 1, 2020
8c3d79d
build-manifest: avoid collecting SHAs in parallel on legacy mode
pietroalbini Oct 1, 2020
07f1055
build-manifest: use BufReader
pietroalbini Oct 1, 2020
3a68d86
Instruct lld that our @ files are posix-style, not Windows
Mark-Simulacrum Oct 4, 2020
af1ae08
Fix miscompile in SimplifyBranchSame
simonvandel Oct 4, 2020
122ab13
Add regression test for SimplifyBranchSame miscompilation
tmiasko Oct 4, 2020
687c08e
Update RLS and Rustfmt
Xanewok Oct 5, 2020
e75c0e7
Move `EarlyOtherwiseBranch` to mir-opt-level 2
ecstatic-morse Oct 5, 2020
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
160 changes: 107 additions & 53 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,16 @@ dependencies = [
"block-padding",
"byte-tools",
"byteorder",
"generic-array",
"generic-array 0.12.3",
]

[[package]]
name = "block-buffer"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
dependencies = [
"generic-array 0.14.4",
]

[[package]]
Expand Down Expand Up @@ -233,8 +242,11 @@ version = "0.1.0"
dependencies = [
"anyhow",
"flate2",
"hex 0.4.2",
"rayon",
"serde",
"serde_json",
"sha2",
"tar",
"toml",
]
Expand Down Expand Up @@ -687,6 +699,12 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a21fa21941700a3cd8fcb4091f361a6a712fac632f85d9f487cc892045d55c6"

[[package]]
name = "cpuid-bool"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"

[[package]]
name = "crates-io"
version = "0.31.1"
Expand Down Expand Up @@ -884,7 +902,16 @@ version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
dependencies = [
"generic-array",
"generic-array 0.12.3",
]

[[package]]
name = "digest"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
dependencies = [
"generic-array 0.14.4",
]

[[package]]
Expand Down Expand Up @@ -1166,6 +1193,16 @@ dependencies = [
"typenum",
]

[[package]]
name = "generic-array"
version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
dependencies = [
"typenum",
"version_check",
]

[[package]]
name = "getopts"
version = "0.2.21"
Expand Down Expand Up @@ -1844,9 +1881,9 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a18af3dcaf2b0219366cdb4e2af65a6101457b415c3d1a5c71dd9c2b7c77b9c8"
dependencies = [
"block-buffer",
"digest",
"opaque-debug",
"block-buffer 0.7.3",
"digest 0.8.1",
"opaque-debug 0.2.3",
]

[[package]]
Expand Down Expand Up @@ -2106,6 +2143,12 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"

[[package]]
name = "opaque-debug"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"

[[package]]
name = "open"
version = "1.4.0"
Expand Down Expand Up @@ -2592,9 +2635,9 @@ dependencies = [

[[package]]
name = "racer"
version = "2.1.38"
version = "2.1.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51dd5fd4247115b28f3e038eb8cda76a0c6f9cb473f769f41f930af8adff22d0"
checksum = "b9424b4650b9c1134d0a1b34dab82319691e1c95fa8af1658fc640deb1b6823c"
dependencies = [
"bitflags",
"clap",
Expand Down Expand Up @@ -2919,19 +2962,19 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_arena"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2958af0d6e0458434a25cd3a96f6e19f24f71bf50b900add520dec52e212866b"
checksum = "e8e941a8fc3878a111d2bbfe78e39522d884136f0b412b12592195f26f653476"
dependencies = [
"rustc-ap-rustc_data_structures",
"smallvec 1.4.2",
]

[[package]]
name = "rustc-ap-rustc_ast"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c82c2510460f2133548e62399e5acd30c25ae6ece30245baab3d1e00c2fefac"
checksum = "3b58b6b035710df7f339a2bf86f6dafa876efd95439540970e24609e33598ca6"
dependencies = [
"bitflags",
"rustc-ap-rustc_data_structures",
Expand All @@ -2946,11 +2989,11 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_ast_passes"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83977da57f81c6edd89bad47e49136680eaa33288de4abb702e95358c2a0fc6c"
checksum = "3d379a900d6a1f098490d92ab83e87487dcee2e4ec3f04c3ac4512b5117b64e2"
dependencies = [
"itertools 0.8.2",
"itertools 0.9.0",
"rustc-ap-rustc_ast",
"rustc-ap-rustc_ast_pretty",
"rustc-ap-rustc_attr",
Expand All @@ -2965,9 +3008,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_ast_pretty"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "becf4ca1638b214694c71a8752192683048ab8bd47947cc481f57bd48157eeb9"
checksum = "658d925c0da9e3c5cddc5e54f4fa8c03b41aff1fc6dc5e41837c1118ad010ac0"
dependencies = [
"rustc-ap-rustc_ast",
"rustc-ap-rustc_span",
Expand All @@ -2977,9 +3020,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_attr"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f21ca5dadce8a40d75a2756b77eab75b4c2d827f645c622dd93ee2285599640"
checksum = "3f387037534f34c148aed753622677500e42d190a095670e7ac3fffc09811a59"
dependencies = [
"rustc-ap-rustc_ast",
"rustc-ap-rustc_ast_pretty",
Expand All @@ -2996,20 +3039,19 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_data_structures"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4cd204764727fde9abf75333eb661f058bfc7242062d91019440fe1b240688b"
checksum = "14ffd17a37e00d77926a0713f191c59ff3aeb2b551a024c7cfffce14bab79be8"
dependencies = [
"bitflags",
"cfg-if",
"crossbeam-utils 0.7.2",
"ena",
"indexmap",
"jobserver",
"lazy_static",
"libc",
"measureme",
"parking_lot 0.10.2",
"parking_lot 0.11.0",
"rustc-ap-rustc_graphviz",
"rustc-ap-rustc_index",
"rustc-ap-rustc_macros",
Expand All @@ -3027,9 +3069,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_errors"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58116f119e37f14c029f99077b347069621118e048a69df74695b98204e7c136"
checksum = "2b3263ddcfa9eb911e54a4e8088878dd9fd10e00d8b99b01033ba4a2733fe91d"
dependencies = [
"annotate-snippets 0.8.0",
"atty",
Expand All @@ -3046,9 +3088,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_expand"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48e3c4bda9b64b92805bebe7431fdb8e24fd112b35a8c6d2174827441f10a6b2"
checksum = "e1ab7e68cede8a2273fd8b8623002ce9dc832e061dfc3330e9bcc1fc2a722d73"
dependencies = [
"rustc-ap-rustc_ast",
"rustc-ap-rustc_ast_passes",
Expand All @@ -3069,32 +3111,31 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_feature"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b612bb67d3fc49f395b03fc4ea4384a0145b05afbadab725803074ec827632b"
checksum = "eea2dc95421bc19bbd4d939399833a882c46b684283b4267ad1fcf982fc043d9"
dependencies = [
"lazy_static",
"rustc-ap-rustc_data_structures",
"rustc-ap-rustc_span",
]

[[package]]
name = "rustc-ap-rustc_fs_util"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7630ad1a73a8434ee920676148cb5440ac57509bd20e94ec41087fb0b1d11c28"
checksum = "1e44c1804f09635f83f6cf1e04c2e92f8aeb7b4e850ac6c53d373dab02c13053"

[[package]]
name = "rustc-ap-rustc_graphviz"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a603fca4817062eb4fb23ff129d475bd66a69fb32f34ed4362ae950cf814b49d"
checksum = "dc491f2b9be6e928f6df6b287549b8d50c48e8eff8638345155f40fa2cfb785d"

[[package]]
name = "rustc-ap-rustc_index"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9850c4a5d7c341513e10802bca9588bf8f452ceea2d5cfa87b934246a52622bc"
checksum = "fa73f3fed413cdb6290738a10267da17b9ae8e02087334778b9a8c9491c5efc0"
dependencies = [
"arrayvec",
"rustc-ap-rustc_macros",
Expand All @@ -3103,18 +3144,18 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_lexer"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d86722e5a1a615b198327d0d794cd9cbc8b9db4542276fc51fe078924de68ea"
checksum = "e993881244a92f3b44cf43c8f22ae2ca5cefe4f55a34e2b65b72ee66fe5ad077"
dependencies = [
"unicode-xid",
]

[[package]]
name = "rustc-ap-rustc_macros"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3fc8482e44cabdda7ac9a8e224aef62ebdf95274d629dac8db3b42321025fea"
checksum = "4effe366556e1d75344764adf4d54cba7c2fad33dbd07588e96d0853831ddc7c"
dependencies = [
"proc-macro2",
"quote",
Expand All @@ -3124,9 +3165,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_parse"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3716cdcd978a91dbd4a2788400e90e809527f841426fbeb92f882f9b8582f3ab"
checksum = "0342675835251571471d3dca9ea1576a853a8dfa1f4b0084db283c861223cb60"
dependencies = [
"bitflags",
"rustc-ap-rustc_ast",
Expand All @@ -3144,19 +3185,19 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_serialize"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c68046d07988b349b2e1c8bc1c9664a1d06519354aa677b9df358c5c5c058da0"
checksum = "438255ed968d73bf6573aa18d3b8d33c0a85ecdfd14160ef09ff813938e0606c"
dependencies = [
"indexmap",
"smallvec 1.4.2",
]

[[package]]
name = "rustc-ap-rustc_session"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85735553501a4de0c8904e37b7ccef79cc1c585a7d7f2cfa02cc38e0d149f982"
checksum = "7d61ff76dede8eb827f6805754900d1097a7046f938f950231b62b448f55bf78"
dependencies = [
"bitflags",
"getopts",
Expand All @@ -3175,9 +3216,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_span"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c49ae8a0d3b9e27c6ffe8febeaa30f899294fff012de70625f9ee81c54fda85"
checksum = "1c267f15c3cfc82a8a441d2bf86bcccf299d1eb625822468e3d8ee6f7c5a1c89"
dependencies = [
"cfg-if",
"md-5",
Expand All @@ -3194,9 +3235,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_target"
version = "677.0.0"
version = "679.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1765f447594740c501c7b666b87639aa7c1dae2bf8c3166d5d2dca16646fd034"
checksum = "8b1b4b266c4d44aac0f7f83b6741d8f0545b03d1ce32f3b5254f2014225cb96c"
dependencies = [
"bitflags",
"rustc-ap-rustc_data_structures",
Expand Down Expand Up @@ -4213,7 +4254,7 @@ dependencies = [

[[package]]
name = "rustfmt-nightly"
version = "1.4.21"
version = "1.4.22"
dependencies = [
"annotate-snippets 0.6.1",
"anyhow",
Expand Down Expand Up @@ -4371,10 +4412,23 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
dependencies = [
"block-buffer",
"digest",
"block-buffer 0.7.3",
"digest 0.8.1",
"fake-simd",
"opaque-debug",
"opaque-debug 0.2.3",
]

[[package]]
name = "sha2"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1"
dependencies = [
"block-buffer 0.9.0",
"cfg-if",
"cpuid-bool",
"digest 0.9.0",
"opaque-debug 0.3.0",
]

[[package]]
Expand Down
6 changes: 6 additions & 0 deletions compiler/rustc_codegen_ssa/src/back/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ impl Command {
LldFlavor::Link => "link",
LldFlavor::Ld64 => "darwin",
});
if let LldFlavor::Wasm = flavor {
// LLVM expects host-specific formatting for @file
// arguments, but we always generate posix formatted files
// at this time. Indicate as such.
c.arg("--rsp-quoting=posix");
}
c
}
};
Expand Down
Loading