diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
index 17c9e520bcea2..5f7af12651376 100644
--- 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
index 5f28fda13efeb..aeadf1562c024 160000
--- 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
index e479ab26406ed..69268fb75fdb4 160000
--- a/src/tools/miri
+++ b/src/tools/miri
@@ -1 +1 @@
-Subproject commit e479ab26406ed8a473987e5f4a1f3be3e978e5d2
+Subproject commit 69268fb75fdb452296caa9bc4aaeff1674279de2