Skip to content

Commit

Permalink
Auto merge of #46811 - michaelwoerister:depkind-is-input, r=nikomatsakis
Browse files Browse the repository at this point in the history
incr.comp.: Mark DepKind node as input.

Fixes `euclid` on https://travis-ci.org/rust-icci.

r? @nikomatsakis
  • Loading branch information
bors committed Dec 18, 2017
2 parents a3a7203 + a3c3245 commit b058dc0
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/librustc/dep_graph/dep_node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ define_dep_nodes!( <'tcx>
[] ObjectLifetimeDefaults(DefIndex),

[] Visibility(DefId),
[] DepKind(CrateNum),
[input] DepKind(CrateNum),
[input] CrateName(CrateNum),
[] ItemChildren(DefId),
[] ExternModStmtCnum(DefId),
Expand Down
24 changes: 24 additions & 0 deletions src/test/incremental/change_crate_dep_kind.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// Test that we detect changes to the `dep_kind` query. If the change is not
// detected then -Zincremental-verify-ich will trigger an assertion.

// revisions:cfail1 cfail2
// compile-flags: -Z query-dep-graph -Cpanic=unwind
// must-compile-successfully

#![feature(panic_unwind)]

// Turn the panic_unwind crate from an explicit into an implicit query:
#[cfg(cfail1)]
extern crate panic_unwind;

fn main() {}

0 comments on commit b058dc0

Please sign in to comment.