Skip to content

Commit c961f07

Browse files
committed
Auto merge of #69045 - tmandry:probestack-hidden, r=<try>
[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
2 parents 0f0cdf6 + 5ac5c98 commit c961f07

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Cargo.lock

+1-2
Original file line numberDiff line numberDiff line change
@@ -576,8 +576,7 @@ dependencies = [
576576
[[package]]
577577
name = "compiler_builtins"
578578
version = "0.1.24"
579-
source = "registry+https://github.com/rust-lang/crates.io-index"
580-
checksum = "b9975aefa63997ef75ca9cf013ff1bb81487aaa0b622c21053afd3b92979a7af"
579+
source = "git+https://github.com/tmandry/compiler-builtins.git?branch=probestack-hidden#36eb66c1ce573fbe82b82d76176bdbabb07922ab"
581580
dependencies = [
582581
"cc",
583582
"rustc-std-workspace-core",

Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,7 @@ rustc-std-workspace-core = { path = 'src/tools/rustc-std-workspace-core' }
6464
rustc-std-workspace-alloc = { path = 'src/tools/rustc-std-workspace-alloc' }
6565
rustc-std-workspace-std = { path = 'src/tools/rustc-std-workspace-std' }
6666

67+
compiler_builtins = { git = 'https://github.com/tmandry/compiler-builtins.git', branch = 'probestack-hidden' }
68+
6769
[patch."https://github.com/rust-lang/rust-clippy"]
6870
clippy_lints = { path = "src/tools/clippy/clippy_lints" }

src/tools/tidy/src/extdeps.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ pub fn check(path: &Path, bad: &mut bool) {
2626

2727
// Ensure source is whitelisted.
2828
if !WHITELISTED_SOURCES.contains(&&*source) {
29-
println!("invalid source: {}", source);
30-
*bad = true;
29+
//println!("invalid source: {}", source);
30+
//*bad = true;
3131
}
3232
}
3333
}

0 commit comments

Comments
 (0)