From 2d22063e4c6fbdb61ce2a2dd9ce50d12fe9f0e9b Mon Sep 17 00:00:00 2001
From: Wesley Wiser <wwiser@gmail.com>
Date: Sun, 15 Sep 2019 12:03:52 -0400
Subject: [const-prop] Handle MIR Rvalue::Box

---
 src/librustc_mir/transform/const_prop.rs | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'src/librustc_mir/transform')

diff --git a/src/librustc_mir/transform/const_prop.rs b/src/librustc_mir/transform/const_prop.rs
index fb2cdce2d7a..984938d00b2 100644
--- a/src/librustc_mir/transform/const_prop.rs
+++ b/src/librustc_mir/transform/const_prop.rs
@@ -8,7 +8,7 @@ use rustc::hir::def::DefKind;
 use rustc::hir::def_id::DefId;
 use rustc::mir::{
     AggregateKind, Constant, Location, Place, PlaceBase, Body, Operand, Rvalue,
-    Local, NullOp, UnOp, StatementKind, Statement, LocalKind,
+    Local, UnOp, StatementKind, Statement, LocalKind,
     TerminatorKind, Terminator,  ClearCrossCrate, SourceInfo, BinOp,
     SourceScope, SourceScopeLocalData, LocalDecl, BasicBlock,
 };
@@ -434,23 +434,6 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
     ) -> Option<Const<'tcx>> {
         let span = source_info.span;
 
-        // if this isn't a supported operation, then return None
-        match rvalue {
-            Rvalue::NullaryOp(NullOp::Box, _) => return None,
-
-            Rvalue::Use(_) |
-            Rvalue::Len(_) |
-            Rvalue::Repeat(..) |
-            Rvalue::Aggregate(..) |
-            Rvalue::Discriminant(..) |
-            Rvalue::Cast(..) |
-            Rvalue::NullaryOp(..) |
-            Rvalue::CheckedBinaryOp(..) |
-            Rvalue::Ref(..) |
-            Rvalue::UnaryOp(..) |
-            Rvalue::BinaryOp(..) => { }
-        }
-
         // perform any special checking for specific Rvalue types
         if let Rvalue::UnaryOp(op, arg) = rvalue {
             trace!("checking UnaryOp(op = {:?}, arg = {:?})", op, arg);
-- 
cgit 1.4.1-3-g733a5