Auto merge of #64262 - Xanewok:always-validate-hir-id-for-typeck-tables, r=<try>

bors · bors · commit 1c025bbf22ee · 2019-09-07T17:49:29.000Z
[DONT MERGE] Always validate HIR ID for TypeckTables ...and not only with `debug_assertions` compiled in - #64250 (comment). cc @Mark-Simulacrum @michaelwoerister Let's do a try run to see if this impacts perf anyhow? r? @ghost
diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
@@ -207,7 +207,7 @@ pub struct LocalTableInContext<'a, V> {
 fn validate_hir_id_for_typeck_tables(local_id_root: Option<DefId>,
                                      hir_id: hir::HirId,
                                      mut_access: bool) {
-    if cfg!(debug_assertions) {
+    // if cfg!(debug_assertions) {
         if let Some(local_id_root) = local_id_root {
             if hir_id.owner != local_id_root.index {
                 ty::tls::with(|tcx| {
@@ -228,7 +228,7 @@ fn validate_hir_id_for_typeck_tables(local_id_root: Option<DefId>,
                 bug!("access to invalid TypeckTables")
             }
         }
-    }
+    // }
 }
 
 impl<'a, V> LocalTableInContext<'a, V> {
diff --git a/src/tools/clippy b/src/tools/clippy
@@ -1 +1 @@
-Subproject commit 5f28fda13efeb85097fe082af4b4827a58b0ecf6
+Subproject commit aeadf1562c024d3c5421e61dc6b8d48c2d7902f5
diff --git a/src/tools/miri b/src/tools/miri
@@ -1 +1 @@
-Subproject commit e479ab26406ed8a473987e5f4a1f3be3e978e5d2
+Subproject commit 69268fb75fdb452296caa9bc4aaeff1674279de2

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ pub struct LocalTableInContext<'a, V> {`
`207`	`207`	`fn validate_hir_id_for_typeck_tables(local_id_root: Option<DefId>,`
`208`	`208`	`hir_id: hir::HirId,`
`209`	`209`	`mut_access: bool) {`
`210`		`- if cfg!(debug_assertions) {`
	`210`	`+ // if cfg!(debug_assertions) {`
`211`	`211`	`if let Some(local_id_root) = local_id_root {`
`212`	`212`	`if hir_id.owner != local_id_root.index {`
`213`	`213`	`ty::tls::with(\|tcx\| {`
`@@ -228,7 +228,7 @@ fn validate_hir_id_for_typeck_tables(local_id_root: Option<DefId>,`
`228`	`228`	`bug!("access to invalid TypeckTables")`
`229`	`229`	`}`
`230`	`230`	`}`
`231`		`- }`
	`231`	`+ // }`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`impl<'a, V> LocalTableInContext<'a, V> {`