Make mir_opt_level default to 2 for optimized levels

spastorino · spastorino · commit 10d0109cd2b8 · 2021-03-03T19:51:47.000-03:00
diff --git a/compiler/rustc_session/src/session.rs b/compiler/rustc_session/src/session.rs
@@ -641,7 +641,10 @@ impl Session {
         self.opts.debugging_opts.binary_dep_depinfo
     }
     pub fn mir_opt_level(&self) -> usize {
-        self.opts.debugging_opts.mir_opt_level.unwrap_or(1)
+        self.opts
+            .debugging_opts
+            .mir_opt_level
+            .unwrap_or_else(|| if self.opts.optimize != config::OptLevel::No { 2 } else { 1 })
     }
 
     /// Gets the features enabled for the current compilation session.

Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,10 @@ impl Session {`
`641`	`641`	`self.opts.debugging_opts.binary_dep_depinfo`
`642`	`642`	`}`
`643`	`643`	`pub fn mir_opt_level(&self) -> usize {`
`644`		`- self.opts.debugging_opts.mir_opt_level.unwrap_or(1)`
	`644`	`+ self.opts`
	`645`	`+ .debugging_opts`
	`646`	`+ .mir_opt_level`
	`647`	`+ .unwrap_or_else(\|\| if self.opts.optimize != config::OptLevel::No { 2 } else { 1 })`
`645`	`648`	`}`
`646`	`649`
`647`	`650`	`/// Gets the features enabled for the current compilation session.`