Skip to content

Commit 535278a

Browse files
pierwillpierwill
committed
Add run-make-fulldeps test
Implement RUSTC_FORCE_INCR_COMP_ARTIFACT_HEADER Also makes minor docs edits.
1 parent 7d7dfba commit 535278a

File tree

12 files changed

+102
-31
lines changed

12 files changed

+102
-31
lines changed

‎compiler/rustc_span/src/def_id.rs

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,17 @@ impl Borrow<Fingerprint> for DefPathHash {
126126
}
127127
}
128128

129-
/// A [`StableCrateId`] is a 64 bit hash of the crate name combined with all
130-
/// `-Cmetadata` arguments. It is to [`CrateNum`] what [`DefPathHash`] is to
129+
/// A [`StableCrateId`] is a 64-bit hash of a crate name, together with all
130+
/// `-Cmetadata` arguments, and some other data. It is to [`CrateNum`] what [`DefPathHash`] is to
131131
/// [`DefId`]. It is stable across compilation sessions.
132132
///
133-
/// Since the ID is a hash value there is a (very small) chance that two crates
133+
/// Since the ID is a hash value, there is a small chance that two crates
134134
/// end up with the same [`StableCrateId`]. The compiler will check for such
135135
/// collisions when loading crates and abort compilation in order to avoid
136136
/// further trouble.
137+
///
138+
/// See the discussion in [`DefId`] for more information
139+
/// on the possibility of hash collisions in rustc,
137140
#[derive(Copy, Clone, Hash, PartialEq, Eq, PartialOrd, Ord, Debug)]
138141
#[derive(HashStable_Generic, Encodable, Decodable)]
139142
pub struct StableCrateId(pub(crate) u64);
@@ -174,8 +177,14 @@ impl StableCrateId {
174177
// Also incorporate the rustc version. Otherwise, with -Zsymbol-mangling-version=v0
175178
// and no -Cmetadata, symbols from the same crate compiled with different versions of
176179
// rustc are named the same.
177-
let rustc_version = option_env!("CFG_VERSION").unwrap_or("unknown version").as_bytes();
178-
hasher.write(rustc_version);
180+
//
181+
// RUSTC_FORCE_INCR_COMP_ARTIFACT_HEADER is used to inject rustc version information
182+
// during testing.
183+
if let Some(val) = std::env::var_os("RUSTC_FORCE_INCR_COMP_ARTIFACT_HEADER") {
184+
hasher.write(val.to_string_lossy().into_owned().as_bytes())
185+
} else {
186+
hasher.write(option_env!("CFG_VERSION").unwrap_or("unknown version").as_bytes());
187+
}
179188

180189
StableCrateId(hasher.finish())
181190
}

‎src/test/run-make-fulldeps/crate-hash-rustc-version/Makefile

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
-include ../../run-make-fulldeps/tools.mk
2+
3+
# Ensure that crates compiled with different rustc versions cannot
4+
# be dynamically linked.
5+
6+
FLAGS := -Cprefer-dynamic -Zsymbol-mangling-version=v0
7+
UNAME := $(shell uname)
8+
ifeq ($(UNAME),Linux)
9+
EXT=".so"
10+
NM_CMD := nm -D
11+
endif
12+
ifeq ($(UNAME),Darwin)
13+
EXT=".dylib"
14+
NM_CMD := nm
15+
endif
16+
17+
ifndef NM_CMD
18+
all:
19+
exit 0
20+
else
21+
all:
22+
# a.rs is a dylib
23+
$(RUSTC) a.rs --crate-type=dylib $(FLAGS)
24+
# Write symbols to disk.
25+
$(NM_CMD) $(call DYLIB,a) > $(TMPDIR)/symbolsbefore
26+
# b.rs is a binary
27+
$(RUSTC) b.rs --extern a=$(TMPDIR)/liba$(EXT) --crate-type=bin -Crpath $(FLAGS)
28+
$(call RUN,b)
29+
# Now re-compile a.rs with another rustc version
30+
RUSTC_FORCE_INCR_COMP_ARTIFACT_HEADER=deadfeed $(RUSTC) a.rs --crate-type=dylib $(FLAGS)
31+
# After compiling with a different rustc version, write symbols to disk again.
32+
$(NM_CMD) $(call DYLIB,a) > $(TMPDIR)/symbolsafter
33+
# As a sanity check, test if the symbols changed:
34+
# If the symbols are identical, there's been an error.
35+
if diff $(TMPDIR)/symbolsbefore $(TMPDIR)/symbolsafter; then exit 1; fi
36+
$(call FAIL,b)
37+
endif

‎src/test/run-make-fulldeps/crate-hash-rustc-version/a.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
pub fn foo(mut x: String) -> String {
2+
x.push_str(", world!");
3+
x
4+
}

‎src/test/run-make-fulldeps/crate-hash-rustc-version/b.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
extern crate a;
2+
3+
use a::foo;
4+
5+
fn main() {
6+
let x = String::from("Hello");
7+
println!("{}", foo(x));
8+
}

‎src/test/ui/symbol-names/const-generics-demangling.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: symbol-name(_RMCsCRATE_HASH_1cINtB0_8UnsignedKhb_E)
1+
error: symbol-name(_RMCsCRATE_HASH_1cINtB<REF>_8UnsignedKhb_E)
22
--> $DIR/const-generics-demangling.rs:8:1
33
|
44
LL | #[rustc_symbol_name]
@@ -16,7 +16,7 @@ error: demangling-alt(<c::Unsigned<11>>)
1616
LL | #[rustc_symbol_name]
1717
| ^^^^^^^^^^^^^^^^^^^^
1818

19-
error: symbol-name(_RMs_CsCRATE_HASH_1cINtB2_6SignedKsn98_E)
19+
error: symbol-name(_RMs_CsCRATE_HASH_1cINtB<REF>_6SignedKsn98_E)
2020
--> $DIR/const-generics-demangling.rs:16:1
2121
|
2222
LL | #[rustc_symbol_name]
@@ -34,7 +34,7 @@ error: demangling-alt(<c::Signed<-152>>)
3434
LL | #[rustc_symbol_name]
3535
| ^^^^^^^^^^^^^^^^^^^^
3636

37-
error: symbol-name(_RMs0_CsCRATE_HASH_1cINtB3_4BoolKb1_E)
37+
error: symbol-name(_RMs0_CsCRATE_HASH_1cINtB<REF>_4BoolKb1_E)
3838
--> $DIR/const-generics-demangling.rs:24:1
3939
|
4040
LL | #[rustc_symbol_name]
@@ -52,7 +52,7 @@ error: demangling-alt(<c::Bool<true>>)
5252
LL | #[rustc_symbol_name]
5353
| ^^^^^^^^^^^^^^^^^^^^
5454

55-
error: symbol-name(_RMs1_CsCRATE_HASH_1cINtB3_4CharKc2202_E)
55+
error: symbol-name(_RMs1_CsCRATE_HASH_1cINtB<REF>_4CharKc2202_E)
5656
--> $DIR/const-generics-demangling.rs:32:1
5757
|
5858
LL | #[rustc_symbol_name]

‎src/test/ui/symbol-names/const-generics-str-demangling.stderr

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: symbol-name(_RMCsCRATE_HASH_1cINtB0_3StrKRe616263_E)
1+
error: symbol-name(_RMCsCRATE_HASH_1cINtB<REF>_3StrKRe616263_E)
22
--> $DIR/const-generics-str-demangling.rs:9:1
33
|
44
LL | #[rustc_symbol_name]
@@ -16,7 +16,7 @@ error: demangling-alt(<c::Str<"abc">>)
1616
LL | #[rustc_symbol_name]
1717
| ^^^^^^^^^^^^^^^^^^^^
1818

19-
error: symbol-name(_RMs_CsCRATE_HASH_1cINtB2_3StrKRe27_E)
19+
error: symbol-name(_RMs_CsCRATE_HASH_1cINtB<REF>_3StrKRe27_E)
2020
--> $DIR/const-generics-str-demangling.rs:15:1
2121
|
2222
LL | #[rustc_symbol_name]
@@ -34,7 +34,7 @@ error: demangling-alt(<c::Str<"'">>)
3434
LL | #[rustc_symbol_name]
3535
| ^^^^^^^^^^^^^^^^^^^^
3636

37-
error: symbol-name(_RMs0_CsCRATE_HASH_1cINtB3_3StrKRe090a_E)
37+
error: symbol-name(_RMs0_CsCRATE_HASH_1cINtB<REF>_3StrKRe090a_E)
3838
--> $DIR/const-generics-str-demangling.rs:21:1
3939
|
4040
LL | #[rustc_symbol_name]
@@ -52,7 +52,7 @@ error: demangling-alt(<c::Str<"\t\n">>)
5252
LL | #[rustc_symbol_name]
5353
| ^^^^^^^^^^^^^^^^^^^^
5454

55-
error: symbol-name(_RMs1_CsCRATE_HASH_1cINtB3_3StrKRee28882c3bc_E)
55+
error: symbol-name(_RMs1_CsCRATE_HASH_1cINtB<REF>_3StrKRee28882c3bc_E)
5656
--> $DIR/const-generics-str-demangling.rs:27:1
5757
|
5858
LL | #[rustc_symbol_name]
@@ -70,7 +70,7 @@ error: demangling-alt(<c::Str<"∂ü">>)
7070
LL | #[rustc_symbol_name]
7171
| ^^^^^^^^^^^^^^^^^^^^
7272

73-
error: symbol-name(_RMs2_CsCRATE_HASH_1cINtB3_3StrKRee183a1e18390e183ade1839be18394e1839ae18390e183935fe18392e18394e1839be183a0e18398e18394e1839ae183985fe183a1e18390e18393e18398e1839ae18398_E)
73+
error: symbol-name(_RMs2_CsCRATE_HASH_1cINtB<REF>_3StrKRee183a1e18390e183ade1839be18394e1839ae18390e183935fe18392e18394e1839be183a0e18398e18394e1839ae183985fe183a1e18390e18393e18398e1839ae18398_E)
7474
--> $DIR/const-generics-str-demangling.rs:33:1
7575
|
7676
LL | #[rustc_symbol_name]
@@ -88,7 +88,7 @@ error: demangling-alt(<c::Str<"საჭმელად_გემრიელი
8888
LL | #[rustc_symbol_name]
8989
| ^^^^^^^^^^^^^^^^^^^^
9090

91-
error: symbol-name(_RMs3_CsCRATE_HASH_1cINtB3_3StrKRef09f908af09fa688f09fa686f09f90ae20c2a720f09f90b6f09f9192e29895f09f94a520c2a720f09fa7a1f09f929bf09f929af09f9299f09f929c_E)
91+
error: symbol-name(_RMs3_CsCRATE_HASH_1cINtB<REF>_3StrKRef09f908af09fa688f09fa686f09f90ae20c2a720f09f90b6f09f9192e29895f09f94a520c2a720f09fa7a1f09f929bf09f929af09f9299f09f929c_E)
9292
--> $DIR/const-generics-str-demangling.rs:39:1
9393
|
9494
LL | #[rustc_symbol_name]

‎src/test/ui/symbol-names/const-generics-structural-demangling.stderr

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: symbol-name(_RMCsCRATE_HASH_1cINtB0_7RefByteKRh7b_E)
1+
error: symbol-name(_RMCsCRATE_HASH_1cINtB<REF>_7RefByteKRh7b_E)
22
--> $DIR/const-generics-structural-demangling.rs:14:1
33
|
44
LL | #[rustc_symbol_name]
@@ -16,7 +16,7 @@ error: demangling-alt(<c::RefByte<{&123}>>)
1616
LL | #[rustc_symbol_name]
1717
| ^^^^^^^^^^^^^^^^^^^^
1818

19-
error: symbol-name(_RMs_CsCRATE_HASH_1cINtB2_6RefZstKRAEE)
19+
error: symbol-name(_RMs_CsCRATE_HASH_1cINtB<REF>_6RefZstKRAEE)
2020
--> $DIR/const-generics-structural-demangling.rs:24:1
2121
|
2222
LL | #[rustc_symbol_name]
@@ -34,7 +34,7 @@ error: demangling-alt(<c::RefZst<{&[]}>>)
3434
LL | #[rustc_symbol_name]
3535
| ^^^^^^^^^^^^^^^^^^^^
3636

37-
error: symbol-name(_RMs0_CsCRATE_HASH_1cINtB3_11Array3BytesKAh1_h2_h3_EE)
37+
error: symbol-name(_RMs0_CsCRATE_HASH_1cINtB<REF>_11Array3BytesKAh1_h2_h3_EE)
3838
--> $DIR/const-generics-structural-demangling.rs:32:1
3939
|
4040
LL | #[rustc_symbol_name]
@@ -52,7 +52,7 @@ error: demangling-alt(<c::Array3Bytes<{[1, 2, 3]}>>)
5252
LL | #[rustc_symbol_name]
5353
| ^^^^^^^^^^^^^^^^^^^^
5454

55-
error: symbol-name(_RMs1_CsCRATE_HASH_1cINtB3_13TupleByteBoolKTh1_b0_EE)
55+
error: symbol-name(_RMs1_CsCRATE_HASH_1cINtB<REF>_13TupleByteBoolKTh1_b0_EE)
5656
--> $DIR/const-generics-structural-demangling.rs:40:1
5757
|
5858
LL | #[rustc_symbol_name]
@@ -70,7 +70,7 @@ error: demangling-alt(<c::TupleByteBool<{(1, false)}>>)
7070
LL | #[rustc_symbol_name]
7171
| ^^^^^^^^^^^^^^^^^^^^
7272

73-
error: symbol-name(_RMs2_CsCRATE_HASH_1cINtB3_11OptionUsizeKVNtINtNtCsCRATE_HASH_4core6option6OptionjE4NoneUE)
73+
error: symbol-name(_RMs2_CsCRATE_HASH_1cINtB<REF>_11OptionUsizeKVNtINtNtCsCRATE_HASH_4core6option6OptionjE4NoneUE)
7474
--> $DIR/const-generics-structural-demangling.rs:50:1
7575
|
7676
LL | #[rustc_symbol_name]
@@ -88,7 +88,7 @@ error: demangling-alt(<c::OptionUsize<{core::option::Option::<usize>::None}>>)
8888
LL | #[rustc_symbol_name]
8989
| ^^^^^^^^^^^^^^^^^^^^
9090

91-
error: symbol-name(_RMs3_CsCRATE_HASH_1cINtB3_11OptionUsizeKVNtINtNtCsCRATE_HASH_4core6option6OptionjE4SomeTj0_EE)
91+
error: symbol-name(_RMs3_CsCRATE_HASH_1cINtB<REF>_11OptionUsizeKVNtINtNtCsCRATE_HASH_4core6option6OptionjE4SomeTj0_EE)
9292
--> $DIR/const-generics-structural-demangling.rs:58:1
9393
|
9494
LL | #[rustc_symbol_name]
@@ -106,7 +106,7 @@ error: demangling-alt(<c::OptionUsize<{core::option::Option::<usize>::Some(0)}>>
106106
LL | #[rustc_symbol_name]
107107
| ^^^^^^^^^^^^^^^^^^^^
108108

109-
error: symbol-name(_RMs4_CsCRATE_HASH_1cINtB3_4Foo_KVNtB3_3FooS1sRe616263_2chc78_5sliceRAh1_h2_h3_EEE)
109+
error: symbol-name(_RMs4_CsCRATE_HASH_1cINtB<REF>_4Foo_KVNtB<REF>_3FooS1sRe616263_2chc78_5sliceRAh1_h2_h3_EEE)
110110
--> $DIR/const-generics-structural-demangling.rs:72:1
111111
|
112112
LL | #[rustc_symbol_name]
@@ -124,7 +124,7 @@ error: demangling-alt(<c::Foo_<{c::Foo { s: "abc", ch: 'x', slice: &[1, 2, 3] }}
124124
LL | #[rustc_symbol_name]
125125
| ^^^^^^^^^^^^^^^^^^^^
126126

127-
error: symbol-name(_RMs9_CsCRATE_HASH_1cINtB3_4Bar_KVNtB3_3BarS1xh7b_s_1xt1000_EE)
127+
error: symbol-name(_RMs9_CsCRATE_HASH_1cINtB<REF>_4Bar_KVNtB<REF>_3BarS1xh7b_s_1xt1000_EE)
128128
--> $DIR/const-generics-structural-demangling.rs:88:5
129129
|
130130
LL | #[rustc_symbol_name]

‎src/test/ui/symbol-names/impl1.v0.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: symbol-name(_RNvMNtCsCRATE_HASH_5impl13fooNtB2_3Foo3bar)
1+
error: symbol-name(_RNvMNtCsCRATE_HASH_5impl13fooNtB<REF>_3Foo3bar)
22
--> $DIR/impl1.rs:14:9
33
|
44
LL | #[rustc_symbol_name]
@@ -22,7 +22,7 @@ error: def-path(foo::Foo::bar)
2222
LL | #[rustc_def_path]
2323
| ^^^^^^^^^^^^^^^^^
2424

25-
error: symbol-name(_RNvMNtCsCRATE_HASH_5impl13barNtNtB4_3foo3Foo3baz)
25+
error: symbol-name(_RNvMNtCsCRATE_HASH_5impl13barNtNtB<REF>_3foo3Foo3baz)
2626
--> $DIR/impl1.rs:32:9
2727
|
2828
LL | #[rustc_symbol_name]
@@ -46,7 +46,7 @@ error: def-path(bar::<impl foo::Foo>::baz)
4646
LL | #[rustc_def_path]
4747
| ^^^^^^^^^^^^^^^^^
4848

49-
error: symbol-name(_RNvXNCNvCsCRATE_HASH_5impl14mains_0ARDNtB6_3Foop5AssocFG_KCRL0_hvEuNtB6_9AutoTraitEL_j3_NtB2_3Bar6method)
49+
error: symbol-name(_RNvXNCNvCsCRATE_HASH_5impl14mains_0ARDNtB<REF>_3Foop5AssocFG_KCRL0_hvEuNtB<REF>_9AutoTraitEL_j3_NtB<REF>_3Bar6method)
5050
--> $DIR/impl1.rs:62:13
5151
|
5252
LL | #[rustc_symbol_name]

‎src/test/ui/symbol-names/issue-60925.v0.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: symbol-name(_RNvMNtCsCRATE_HASH_11issue_609253fooINtB2_3FooNtNtB4_4llvm3FooE3foo)
1+
error: symbol-name(_RNvMNtCsCRATE_HASH_11issue_609253fooINtB<REF>_3FooNtNtB<REF>_4llvm3FooE3foo)
22
--> $DIR/issue-60925.rs:21:9
33
|
44
LL | #[rustc_symbol_name]

‎src/test/ui/symbol-names/issue-75326.v0.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: symbol-name(_RNvXINICsCRATE_HASH_11issue_75326s_0pppEINtB5_3FooppENtB5_9Iterator24nextB5_)
1+
error: symbol-name(_RNvXINICsCRATE_HASH_11issue_75326s_0pppEINtB<REF>_3FooppENtB<REF>_9Iterator24nextB<REF>_)
22
--> $DIR/issue-75326.rs:41:5
33
|
44
LL | #[rustc_symbol_name]

0 commit comments

Comments
 (0)