Skip to content

Commit 540c916

Browse files
committed
---
yaml --- r: 276939 b: refs/heads/try c: 50a40e1 h: refs/heads/master i: 276937: 6709f5f 276935: aba4cf2
1 parent 480c1cd commit 540c916

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
33
refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
4-
refs/heads/try: a2e0cbc6fc64db7672d8b0d5140dea964c1abf23
4+
refs/heads/try: 50a40e1c37761acc404d4b95e0448d7a01b6e38b
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc_incremental/calculate_svh.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@ impl<'tcx> SvhCalculate for ty::TyCtxt<'tcx> {
4444
let mut state = SipHasher::new();
4545
debug!("state: {:?}", state);
4646

47+
// FIXME(#32753) -- at (*) we `to_le` for endianness, but is
48+
// this enough, and does it matter anyway?
4749
"crate_disambiguator".hash(&mut state);
48-
crate_disambiguator.as_str().len().hash(&mut state);
50+
crate_disambiguator.as_str().len().to_le().hash(&mut state); // (*)
4951
crate_disambiguator.as_str().hash(&mut state);
5052

5153
debug!("crate_disambiguator: {:?}", crate_disambiguator.as_str());

branches/try/src/librustc_incremental/persist/load.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ fn initial_dirty_nodes<'tcx>(tcx: &ty::TyCtxt<'tcx>,
151151
for hashed_item in hashed_items {
152152
match retraced.def_id(hashed_item.index) {
153153
Some(def_id) => {
154+
// FIXME(#32753) -- should we use a distinct hash here
154155
let current_hash = tcx.calculate_item_hash(def_id);
155156
debug!("initial_dirty_nodes: hash of {:?} is {:?}, was {:?}",
156157
def_id, current_hash, hashed_item.hash);

branches/try/src/librustc_incremental/persist/save.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ pub fn encode_dep_graph<'tcx>(tcx: &ty::TyCtxt<'tcx>,
9393
assert!(def_id.is_local());
9494
builder.add(def_id)
9595
.map(|index| {
96+
// FIXME(#32753) -- should we use a distinct hash here
9697
let hash = tcx.calculate_item_hash(def_id);
9798
SerializedHash { index: index, hash: hash }
9899
})

0 commit comments

Comments
 (0)