Skip to content

Commit

Permalink
Auto merge of #69045 - tmandry:probestack-hidden, r=<try>
Browse files Browse the repository at this point in the history
[DO NOT MERGE] Try setting __rust_probestack visibility back to hidden

This is to fix #68794, but it may break some platforms. Uploading this change to test in CI.

r? @ghost
  • Loading branch information
bors committed Feb 11, 2020
2 parents 0f0cdf6 + 5ac5c98 commit c961f07
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
3 changes: 1 addition & 2 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -576,8 +576,7 @@ dependencies = [
[[package]]
name = "compiler_builtins"
version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9975aefa63997ef75ca9cf013ff1bb81487aaa0b622c21053afd3b92979a7af"
source = "git+https://github.com/tmandry/compiler-builtins.git?branch=probestack-hidden#36eb66c1ce573fbe82b82d76176bdbabb07922ab"
dependencies = [
"cc",
"rustc-std-workspace-core",
Expand Down
2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,7 @@ rustc-std-workspace-core = { path = 'src/tools/rustc-std-workspace-core' }
rustc-std-workspace-alloc = { path = 'src/tools/rustc-std-workspace-alloc' }
rustc-std-workspace-std = { path = 'src/tools/rustc-std-workspace-std' }

compiler_builtins = { git = 'https://github.com/tmandry/compiler-builtins.git', branch = 'probestack-hidden' }

[patch."https://github.com/rust-lang/rust-clippy"]
clippy_lints = { path = "src/tools/clippy/clippy_lints" }
4 changes: 2 additions & 2 deletions src/tools/tidy/src/extdeps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ pub fn check(path: &Path, bad: &mut bool) {

// Ensure source is whitelisted.
if !WHITELISTED_SOURCES.contains(&&*source) {
println!("invalid source: {}", source);
*bad = true;
//println!("invalid source: {}", source);
//*bad = true;
}
}
}

0 comments on commit c961f07

Please sign in to comment.