Only enable new solver if GCE

compiler-errors · compiler-errors · commit c2c01158bbab · 2025-05-06T14:46:13.000Z
diff --git a/compiler/rustc_ast_passes/src/feature_gate.rs b/compiler/rustc_ast_passes/src/feature_gate.rs
@@ -636,7 +636,7 @@ fn check_incompatible_features(sess: &Session, features: &Features) {
 }
 
 fn check_new_solver_banned_features(sess: &Session, features: &Features) {
-    if !sess.opts.unstable_opts.next_solver.globally {
+    if !sess.opts.unstable_opts.next_solver.globally || true {
         return;
     }
 
diff --git a/compiler/rustc_middle/src/ty/context.rs b/compiler/rustc_middle/src/ty/context.rs
@@ -3335,7 +3335,7 @@ impl<'tcx> TyCtxt<'tcx> {
     }
 
     pub fn next_trait_solver_globally(self) -> bool {
-        self.sess.opts.unstable_opts.next_solver.globally
+        self.sess.opts.unstable_opts.next_solver.globally && !self.features().generic_const_exprs()
     }
 
     pub fn next_trait_solver_in_coherence(self) -> bool {

Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,7 @@ fn check_incompatible_features(sess: &Session, features: &Features) {`
`636`	`636`	`}`
`637`	`637`
`638`	`638`	`fn check_new_solver_banned_features(sess: &Session, features: &Features) {`
`639`		`- if !sess.opts.unstable_opts.next_solver.globally {`
	`639`	`+ if !sess.opts.unstable_opts.next_solver.globally \|\| true {`
`640`	`640`	`return;`
`641`	`641`	`}`
`642`	`642`
Original file line number	Diff line number	Diff line change
`@@ -3335,7 +3335,7 @@ impl<'tcx> TyCtxt<'tcx> {`
`3335`	`3335`	`}`
`3336`	`3336`
`3337`	`3337`	`pub fn next_trait_solver_globally(self) -> bool {`
`3338`		`- self.sess.opts.unstable_opts.next_solver.globally`
	`3338`	`+ self.sess.opts.unstable_opts.next_solver.globally && !self.features().generic_const_exprs()`
`3339`	`3339`	`}`
`3340`	`3340`
`3341`	`3341`	`pub fn next_trait_solver_in_coherence(self) -> bool {`