Don't try to mark eval_always queries as green before running them

Zoxc · Zoxc · commit 59c6c5a54938 · 2019-02-06T03:01:01.000+01:00
diff --git a/src/librustc/ty/query/plumbing.rs b/src/librustc/ty/query/plumbing.rs
@@ -400,7 +400,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
             return Ok(result);
         }
 
-        if !dep_node.kind.is_input() {
+        if !dep_node.kind.is_input() && !dep_node.kind.is_eval_always() {
             if let Some((prev_dep_node_index,
                          dep_node_index)) = self.dep_graph.try_mark_green_and_read(self,
                                                                                    &dep_node) {

Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {`
`400`	`400`	`return Ok(result);`
`401`	`401`	`}`
`402`	`402`
`403`		`- if !dep_node.kind.is_input() {`
	`403`	`+ if !dep_node.kind.is_input() && !dep_node.kind.is_eval_always() {`
`404`	`404`	`if let Some((prev_dep_node_index,`
`405`	`405`	`dep_node_index)) = self.dep_graph.try_mark_green_and_read(self,`
`406`	`406`	`&dep_node) {`