From ffb925c0f04cd2ba475ae923f92542a136ca3fbc Mon Sep 17 00:00:00 2001
From: Miguel Guarniz <mi9uel9@gmail.com>
Date: Sun, 7 Aug 2022 13:54:01 -0400
Subject: [PATCH 1/2] Remove opt_remap_env_constness from rustc_query_impl

Signed-off-by: Miguel Guarniz <mi9uel9@gmail.com>
---
 compiler/rustc_middle/src/ty/query.rs     |  1 +
 compiler/rustc_query_impl/src/plumbing.rs | 12 +-----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/compiler/rustc_middle/src/ty/query.rs b/compiler/rustc_middle/src/ty/query.rs
index 2452bcf6a61b8..2911be819662d 100644
--- a/compiler/rustc_middle/src/ty/query.rs
+++ b/compiler/rustc_middle/src/ty/query.rs
@@ -162,6 +162,7 @@ macro_rules! separate_provide_extern_default {
     };
 }
 
+#[macro_export]
 macro_rules! opt_remap_env_constness {
     ([][$name:ident]) => {};
     ([(remap_env_constness) $($rest:tt)*][$name:ident]) => {
diff --git a/compiler/rustc_query_impl/src/plumbing.rs b/compiler/rustc_query_impl/src/plumbing.rs
index eda4401c81d01..5ebde81534b85 100644
--- a/compiler/rustc_query_impl/src/plumbing.rs
+++ b/compiler/rustc_query_impl/src/plumbing.rs
@@ -233,21 +233,11 @@ macro_rules! get_provider {
     };
 }
 
-macro_rules! opt_remap_env_constness {
-    ([][$name:ident]) => {};
-    ([(remap_env_constness) $($rest:tt)*][$name:ident]) => {
-        let $name = $name.without_const();
-    };
-    ([$other:tt $($modifiers:tt)*][$name:ident]) => {
-        opt_remap_env_constness!([$($modifiers)*][$name])
-    };
-}
-
 macro_rules! define_queries {
     (<$tcx:tt>
      $($(#[$attr:meta])*
         [$($modifiers:tt)*] fn $name:ident($($K:tt)*) -> $V:ty,)*) => {
-
+        use rustc_middle::opt_remap_env_constness;
         define_queries_struct! {
             tcx: $tcx,
             input: ($(([$($modifiers)*] [$($attr)*] [$name]))*)

From 3a37f0b7aed8b82bf797e555a5a1bf3c8f578514 Mon Sep 17 00:00:00 2001
From: Miguel Guarniz <mi9uel9@gmail.com>
Date: Mon, 15 Aug 2022 14:36:03 -0400
Subject: [PATCH 2/2] Remove usages of opt_remap_env_constness

Signed-off-by: Miguel Guarniz <mi9uel9@gmail.com>
---
 compiler/rustc_middle/src/ty/query.rs     | 1 -
 compiler/rustc_query_impl/src/plumbing.rs | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/compiler/rustc_middle/src/ty/query.rs b/compiler/rustc_middle/src/ty/query.rs
index 2911be819662d..2452bcf6a61b8 100644
--- a/compiler/rustc_middle/src/ty/query.rs
+++ b/compiler/rustc_middle/src/ty/query.rs
@@ -162,7 +162,6 @@ macro_rules! separate_provide_extern_default {
     };
 }
 
-#[macro_export]
 macro_rules! opt_remap_env_constness {
     ([][$name:ident]) => {};
     ([(remap_env_constness) $($rest:tt)*][$name:ident]) => {
diff --git a/compiler/rustc_query_impl/src/plumbing.rs b/compiler/rustc_query_impl/src/plumbing.rs
index 5ebde81534b85..339683cf68958 100644
--- a/compiler/rustc_query_impl/src/plumbing.rs
+++ b/compiler/rustc_query_impl/src/plumbing.rs
@@ -237,7 +237,6 @@ macro_rules! define_queries {
     (<$tcx:tt>
      $($(#[$attr:meta])*
         [$($modifiers:tt)*] fn $name:ident($($K:tt)*) -> $V:ty,)*) => {
-        use rustc_middle::opt_remap_env_constness;
         define_queries_struct! {
             tcx: $tcx,
             input: ($(([$($modifiers)*] [$($attr)*] [$name]))*)
@@ -249,7 +248,6 @@ macro_rules! define_queries {
             // Create an eponymous constructor for each query.
             $(#[allow(nonstandard_style)] $(#[$attr])*
             pub fn $name<$tcx>(tcx: QueryCtxt<$tcx>, key: query_keys::$name<$tcx>) -> QueryStackFrame {
-                opt_remap_env_constness!([$($modifiers)*][key]);
                 let kind = dep_graph::DepKind::$name;
                 let name = stringify!($name);
                 // Disable visible paths printing for performance reasons.
@@ -539,7 +537,6 @@ macro_rules! define_queries_struct {
                 key: query_keys::$name<$tcx>,
                 mode: QueryMode,
             ) -> Option<query_stored::$name<$tcx>> {
-                opt_remap_env_constness!([$($modifiers)*][key]);
                 let qcx = QueryCtxt { tcx, queries: self };
                 get_query::<queries::$name<$tcx>, _>(qcx, span, key, mode)
             })*