Skip to content
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

Jump to bottom

Rollup of 3 pull requests #60992

Closed
wants to merge 7 commits into from
Closed

Rollup of 3 pull requests #60992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b53d839
Move arbitrary_self_types's tests into ui/self
taiki-e May 19, 2019
3e73ca6
Move run-pass/self/* to ui/self
taiki-e May 19, 2019
69c6326
Bump compiler-builtins to 0.1.15
alexcrichton May 20, 2019
a775d11
Fix MSP430 AsmPrinter and assembler syntax mismatch.
cr1901 May 20, 2019
5bc84d2
Rollup merge of #60950 - taiki-e:arbitrary_self_types-tests, r=Centril
Centril May 21, 2019
89f7628
Rollup merge of #60981 - alexcrichton:update-compiler-builtins, r=cuv…
Centril May 21, 2019
62afa76
Rollup merge of #60985 - cr1901:msp430-fix, r=alexcrichton
Centril May 21, 2019
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
34 changes: 17 additions & 17 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies = [
name = "alloc"
version = "0.0.0"
dependencies = [
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"core 0.0.0",
"rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -123,7 +123,7 @@ version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-std-workspace-core 1.0.0",
]
Expand Down Expand Up @@ -462,7 +462,7 @@ dependencies = [

[[package]]
name = "compiler_builtins"
version = "0.1.14"
version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -744,7 +744,7 @@ name = "dlmalloc"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-std-workspace-core 1.0.0",
]
Expand Down Expand Up @@ -910,7 +910,7 @@ name = "fortanix-sgx-abi"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-std-workspace-core 1.0.0",
]

Expand Down Expand Up @@ -1071,7 +1071,7 @@ name = "hashbrown"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-std-workspace-alloc 1.0.0",
"rustc-std-workspace-core 1.0.0",
]
Expand Down Expand Up @@ -1772,7 +1772,7 @@ dependencies = [
name = "panic_abort"
version = "0.0.0"
dependencies = [
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"core 0.0.0",
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
]
Expand All @@ -1782,7 +1782,7 @@ name = "panic_unwind"
version = "0.0.0"
dependencies = [
"alloc 0.0.0",
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"core 0.0.0",
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
"unwind 0.0.0",
Expand Down Expand Up @@ -1967,7 +1967,7 @@ name = "profiler_builtins"
version = "0.0.0"
dependencies = [
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"core 0.0.0",
]

Expand Down Expand Up @@ -2492,7 +2492,7 @@ name = "rustc-demangle"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-std-workspace-core 1.0.0",
]

Expand Down Expand Up @@ -2620,7 +2620,7 @@ dependencies = [
"alloc 0.0.0",
"build_helper 0.1.0",
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"core 0.0.0",
]

Expand Down Expand Up @@ -2850,7 +2850,7 @@ dependencies = [
"alloc 0.0.0",
"build_helper 0.1.0",
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"core 0.0.0",
]

Expand Down Expand Up @@ -2912,7 +2912,7 @@ dependencies = [
"alloc 0.0.0",
"build_helper 0.1.0",
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"core 0.0.0",
]

Expand Down Expand Up @@ -3029,7 +3029,7 @@ dependencies = [
"alloc 0.0.0",
"build_helper 0.1.0",
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"core 0.0.0",
]

Expand Down Expand Up @@ -3298,7 +3298,7 @@ dependencies = [
"alloc 0.0.0",
"backtrace-sys 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"core 0.0.0",
"dlmalloc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"fortanix-sgx-abi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -3889,7 +3889,7 @@ name = "unwind"
version = "0.0.0"
dependencies = [
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"core 0.0.0",
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
]
Expand Down Expand Up @@ -4087,7 +4087,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b0aa3473e85a3161b59845d6096b289bb577874cafeaf75ea1b1beaa6572c7fc"
"checksum commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007"
"checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2"
"checksum compiler_builtins 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "e3f235c329e5cb9fa3d2ca2cc36256ba9a7f23fa76e0f4db6f68c23b73b2ac69"
"checksum compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "e899b947d7e71c3d35c0b6194d64025b84946640510e215090c815b20828964e"
"checksum compiletest_rs 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "f40ecc9332b68270998995c00f8051ee856121764a0d3230e64c9efd059d27b6"
"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
"checksum core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4e2640d6d0bf22e82bed1b73c6aef8d5dd31e5abe6666c57e6d45e2649f4f887"
Expand Down
29 changes: 28 additions & 1 deletion src/bootstrap/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,33 @@ pub fn std_cargo(builder: &Builder<'_>,
cargo.env("MACOSX_DEPLOYMENT_TARGET", target);
}

// Determine if we're going to compile in optimized C intrinsics to
// the `compiler-builtins` crate. These intrinsics live in LLVM's
// `compiler-rt` repository, but our `src/llvm-project` submodule isn't
// always checked out, so we need to conditionally look for this. (e.g. if
// an external LLVM is used we skip the LLVM submodule checkout).
//
// Note that this shouldn't affect the correctness of `compiler-builtins`,
// but only its speed. Some intrinsics in C haven't been translated to Rust
// yet but that's pretty rare. Other intrinsics have optimized
// implementations in C which have only had slower versions ported to Rust,
// so we favor the C version where we can, but it's not critical.
//
// If `compiler-rt` is available ensure that the `c` feature of the
// `compiler-builtins` crate is enabled and it's configured to learn where
// `compiler-rt` is located.
let compiler_builtins_root = builder.src.join("src/llvm-project/compiler-rt");
let compiler_builtins_c_feature = if compiler_builtins_root.exists() {
cargo.env("RUST_COMPILER_RT_ROOT", &compiler_builtins_root);
" compiler-builtins-c".to_string()
} else {
String::new()
};

if builder.no_std(target) == Some(true) {
let mut features = "compiler-builtins-mem".to_string();
features.push_str(&compiler_builtins_c_feature);

// for no-std targets we only compile a few no_std crates
cargo
.args(&["-p", "alloc"])
Expand All @@ -170,7 +196,8 @@ pub fn std_cargo(builder: &Builder<'_>,
.arg("--features")
.arg("compiler-builtins-mem compiler-builtins-c");
} else {
let features = builder.std_features();
let mut features = builder.std_features();
features.push_str(&compiler_builtins_c_feature);

if compiler.stage != 0 && builder.config.sanitizers {
// This variable is used by the sanitizer runtime crates, e.g.
Expand Down
6 changes: 3 additions & 3 deletions src/build_helper/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,9 @@ pub fn sanitizer_lib_boilerplate(sanitizer_name: &str)
} else {
format!("static={}", link_name)
};
// The source for `compiler-rt` comes from the `compiler-builtins` crate, so
// load our env var set by cargo to find the source code.
let dir = env::var_os("DEP_COMPILER_RT_COMPILER_RT").unwrap();
// This env var is provided by rustbuild to tell us where `compiler-rt`
// lives.
let dir = env::var_os("RUST_COMPILER_RT_ROOT").unwrap();
let lib = native_lib_boilerplate(
dir.as_ref(),
sanitizer_name,
Expand Down
6 changes: 3 additions & 3 deletions src/libstd/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ panic_unwind = { path = "../libpanic_unwind", optional = true }
panic_abort = { path = "../libpanic_abort" }
core = { path = "../libcore" }
libc = { version = "0.2.51", default-features = false, features = ['rustc-dep-of-std'] }
compiler_builtins = { version = "0.1.14" }
compiler_builtins = { version = "0.1.15" }
profiler_builtins = { path = "../libprofiler_builtins", optional = true }
unwind = { path = "../libunwind" }
hashbrown = { version = "0.3.0", features = ['rustc-dep-of-std'] }
Expand Down Expand Up @@ -49,12 +49,12 @@ fortanix-sgx-abi = { version = "0.3.2", features = ['rustc-dep-of-std'] }
cc = "1.0"

[features]
default = ["compiler_builtins_c", "std_detect_file_io", "std_detect_dlsym_getauxval"]
default = ["std_detect_file_io", "std_detect_dlsym_getauxval"]

backtrace = ["backtrace-sys"]
panic-unwind = ["panic_unwind"]
profiler = ["profiler_builtins"]
compiler_builtins_c = ["alloc/compiler-builtins-c"]
compiler-builtins-c = ["alloc/compiler-builtins-c"]
llvm-libunwind = ["unwind/llvm-libunwind"]

# Make panics and failed asserts immediately abort without formatting any message
Expand Down
2 changes: 1 addition & 1 deletion src/llvm-project
Open in desktop
Submodule llvm-project updated 3 files
+1 −1 compiler-rt/lib/profile/InstrProfilingUtil.c
+2 −2 llvm/lib/Target/MSP430/MSP430AsmPrinter.cpp
+15 −0 llvm/test/CodeGen/MSP430/inline-asm-absolute-addressing.ll
0 ...i/arbitrary-self-types-not-object-safe.rs → ...f/arbitrary-self-types-not-object-safe.rs
View file
Open in desktop
File renamed without changes.
0 ...bitrary-self-types-not-object-safe.stderr → ...bitrary-self-types-not-object-safe.stderr
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...trary_self_types_pointers_and_wrappers.rs → ...trary_self_types_pointers_and_wrappers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// run-pass
#![feature(arbitrary_self_types, unsize, coerce_unsized, dispatch_from_dyn)]
#![feature(rustc_attrs)]

Expand Down
0 ...rbitrary_self_types_raw_pointer_struct.rs → ...rbitrary_self_types_raw_pointer_struct.rs
View file
Open in desktop
File renamed without changes.
0 ...arbitrary_self_types_raw_pointer_trait.rs → ...arbitrary_self_types_raw_pointer_trait.rs
View file
Open in desktop
File renamed without changes.
0 ...n-pass/self/arbitrary_self_types_silly.rs → ...est/ui/self/arbitrary_self_types_silly.rs
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...s/arbitrary_self_types_stdlib_pointers.rs → ...f/arbitrary_self_types_stdlib_pointers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// run-pass
#![feature(arbitrary_self_types)]
#![feature(rustc_attrs)]

Expand Down
0 ...-pass/self/arbitrary_self_types_struct.rs → ...st/ui/self/arbitrary_self_types_struct.rs
View file
Open in desktop
File renamed without changes.
0 ...n-pass/self/arbitrary_self_types_trait.rs → ...est/ui/self/arbitrary_self_types_trait.rs
View file
Open in desktop
File renamed without changes.
0 ...lf/arbitrary_self_types_unsized_struct.rs → ...lf/arbitrary_self_types_unsized_struct.rs
View file
Open in desktop
File renamed without changes.
0 ...ss/self/auxiliary/explicit_self_xcrate.rs → ...ui/self/auxiliary/explicit_self_xcrate.rs
View file
Open in desktop
File renamed without changes.
0 ...pass/self/builtin-superkinds-self-type.rs → ...t/ui/self/builtin-superkinds-self-type.rs
View file
Open in desktop
File renamed without changes.
0 ...un-pass/self/by-value-self-in-mut-slot.rs → ...test/ui/self/by-value-self-in-mut-slot.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...t/run-pass/self/explicit-self-closures.rs → src/test/ui/self/explicit-self-closures.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// run-pass
// compile-pass
#![allow(dead_code)]
// Test to make sure that explicit self params work inside closures

Expand Down
0 ...st/run-pass/self/explicit-self-generic.rs → src/test/ui/self/explicit-self-generic.rs
View file
Open in desktop
File renamed without changes.
0 ...n-pass/self/explicit-self-objects-uniq.rs → ...est/ui/self/explicit-self-objects-uniq.rs
View file
Open in desktop
File renamed without changes.
0 src/test/run-pass/self/explicit-self.rs → src/test/ui/self/explicit-self.rs
View file
Open in desktop
File renamed without changes.
0 ...run-pass/self/explicit_self_xcrate_exe.rs → src/test/ui/self/explicit_self_xcrate_exe.rs
View file
Open in desktop
File renamed without changes.
0 src/test/run-pass/self/move-self.rs → src/test/ui/self/move-self.rs
View file
Open in desktop
File renamed without changes.
0 ...object-safety-sized-self-by-value-self.rs → ...object-safety-sized-self-by-value-self.rs
View file
Open in desktop
File renamed without changes.
0 ...bject-safety-sized-self-generic-method.rs → ...bject-safety-sized-self-generic-method.rs
View file
Open in desktop
File renamed without changes.
0 ...f/object-safety-sized-self-return-Self.rs → ...f/object-safety-sized-self-return-Self.rs
View file
Open in desktop
File renamed without changes.
0 src/test/run-pass/self/self-impl.rs → src/test/ui/self/self-impl-2.rs
View file
Open in desktop
File renamed without changes.
0 ...s/self/self-in-mut-slot-default-method.rs → ...i/self/self-in-mut-slot-default-method.rs
View file
Open in desktop
File renamed without changes.
0 .../self/self-in-mut-slot-immediate-value.rs → .../self/self-in-mut-slot-immediate-value.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/test/run-pass/self/self-in-typedefs.rs → src/test/ui/self/self-in-typedefs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// run-pass
// compile-pass

#![feature(untagged_unions)]

Expand Down
0 src/test/run-pass/self/self-re-assign.rs → src/test/ui/self/self-re-assign.rs
View file
Open in desktop
File renamed without changes.
0 ...st/run-pass/self/self-shadowing-import.rs → src/test/ui/self/self-shadowing-import.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/test/run-pass/self/self-type-param.rs → src/test/ui/self/self-type-param.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// run-pass
// compile-pass
#![allow(dead_code)]
// pretty-expanded FIXME #23616

Expand Down
0 src/test/run-pass/self/string-self-append.rs → src/test/ui/self/string-self-append.rs
View file
Open in desktop
File renamed without changes.
0 src/test/run-pass/self/ufcs-explicit-self.rs → src/test/ui/self/ufcs-explicit-self.rs
View file
Open in desktop
File renamed without changes.
0 ...st/run-pass/self/uniq-self-in-mut-slot.rs → src/test/ui/self/uniq-self-in-mut-slot.rs
View file
Open in desktop
File renamed without changes.
0 src/test/run-pass/self/where-for-self.rs → src/test/ui/self/where-for-self.rs
View file
Open in desktop
File renamed without changes.