From: bors <bors@rust-lang.org>
Date: Wed, 2 May 2018 16:35:38 +0000 (+0000)
Subject: Auto merge of #5458 - alexcrichton:track-panic, r=matklad
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~28
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=31b38fe7e0322241dc06cc6fc7ebe2539eed4942;p=cargo.git

Auto merge of #5458 - alexcrichton:track-panic, r=matklad

Track panic mode in fingerprint

Ensure that if we've previously compiled a crate with panic=abort and we later
need it for panic=unwind we correctly recompile it.

Closes #5445
---

31b38fe7e0322241dc06cc6fc7ebe2539eed4942
diff --cc src/cargo/core/compiler/fingerprint.rs
index 78b18af26,c91d35093..551aab143
--- a/src/cargo/core/compiler/fingerprint.rs
+++ b/src/cargo/core/compiler/fingerprint.rs
@@@ -457,11 -455,12 +457,12 @@@ fn calculate<'a, 'cfg>
      let profile_hash = util::hash_u64(&(
          &unit.profile,
          unit.mode,
 -        cx.extra_args_for(unit),
 +        bcx.extra_args_for(unit),
          cx.incremental_args(unit)?,
+         cx.used_in_plugin.contains(unit), // used when passing panic=abort
      ));
      let fingerprint = Arc::new(Fingerprint {
 -        rustc: util::hash_u64(&cx.build_config.rustc.verbose_version),
 +        rustc: util::hash_u64(&bcx.build_config.rustc.verbose_version),
          target: util::hash_u64(&unit.target),
          profile: profile_hash,
          // Note that .0 is hashed here, not .1 which is the cwd. That doesn't