Simplify fn call const propagation (by wesleywiser)

Author: felix91gr

src/librustc_mir/transform/const_prop.rs

@@ -1031,24 +1031,20 @@ impl<'mir, 'tcx> MutVisitor<'tcx> for ConstPropagator<'mir, 'tcx> {
                 // We try to, before exiting.
                 for opr in args {
                     // We see if the operand can be evaluated, and if so, we continue.
-                    if let Some(op_ty) = self.eval_operand(&opr, source_info) {
-                        // We must also ask if it *should* be evaluated.
-                        if self.should_const_prop(op_ty) {
-                            if let interpret::Operand::Immediate(immediate) = *op_ty {
-                                // Only Immediate from here on
-                                // FIXME(felix91gr): The code only works for Immediate. Investigate
-                                // if it could be made to work for Indirect as well.
-                                if let interpret::Immediate::Scalar(scalar_mu) = immediate {
-                                    // FIXME(felix91gr): This only works for Scalar
-                                    // Could probably be expanded for Scalar Tuples (inside the Immediate)
-                                    if let ScalarMaybeUndef::Scalar(scalar) = scalar_mu {
-                                        let operand_type = opr.ty(&self.local_decls, self.tcx);
-                                        *opr = self.operand_from_scalar(
-                                            scalar,
-                                            operand_type,
-                                            source_info.span,
-                                        );
-                                    }
+                    if let Some(l) = opr.place().and_then(|p| p.as_local()) {
+                        if let Some(value) = self.get_const(l) {
+                            if self.should_const_prop(value) {
+                                if let interpret::Operand::Immediate(
+                                    interpret::Immediate::Scalar(
+                                        interpret::ScalarMaybeUndef::Scalar(scalar),
+                                    ),
+                                ) = *value
+                                {
+                                    *opr = self.operand_from_scalar(
+                                        scalar,
+                                        value.layout.ty,
+                                        source_info.span,
+                                    );
                                 }
                             }
                         }

src/test/mir-opt/const_prop/switch_int/rustc.main.ConstProp.diff

@@ -36,8 +36,7 @@
                                            // + ty: i32
                                            // + val: Value(Scalar(0xffffffff))
                                            // mir::Constant
--                                          // + span: $DIR/switch_int.rs:9:18: 9:20
-+                                          // + span: $DIR/switch_int.rs:9:14: 9:21
+                                           // + span: $DIR/switch_int.rs:9:18: 9:20
                                            // + literal: Const { ty: i32, val: Value(Scalar(0xffffffff)) }
       }
 
@@ -53,8 +52,7 @@
                                            // + ty: i32
                                            // + val: Value(Scalar(0x00000000))
                                            // mir::Constant
--                                          // + span: $DIR/switch_int.rs:8:18: 8:19
-+                                          // + span: $DIR/switch_int.rs:8:14: 8:20
+                                           // + span: $DIR/switch_int.rs:8:18: 8:19
                                            // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
       }
 

src/test/mir-opt/const_prop/switch_int/rustc.main.SimplifyBranches-after-const-prop.diff

@@ -36,7 +36,7 @@
                                            // + ty: i32
                                            // + val: Value(Scalar(0xffffffff))
                                            // mir::Constant
-                                           // + span: $DIR/switch_int.rs:9:14: 9:21
+                                           // + span: $DIR/switch_int.rs:9:18: 9:20
                                            // + literal: Const { ty: i32, val: Value(Scalar(0xffffffff)) }
       }
 
@@ -52,7 +52,7 @@
                                            // + ty: i32
                                            // + val: Value(Scalar(0x00000000))
                                            // mir::Constant
-                                           // + span: $DIR/switch_int.rs:8:14: 8:20
+                                           // + span: $DIR/switch_int.rs:8:18: 8:19
                                            // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
       }