1 files changed, 38 insertions, 29 deletions

diff --git a/llvm/lib/IR/ConstantFold.cpp b/llvm/lib/IR/ConstantFold.cpp
index a6cd8331008..218a25fdfff 100644
--- a/llvm/lib/IR/ConstantFold.cpp
+++ b/llvm/lib/IR/ConstantFold.cpp
@@ -941,43 +941,52 @@ Constant *llvm::ConstantFoldInsertValueInstruction(Constant *Agg,
 Constant *llvm::ConstantFoldUnaryInstruction(unsigned Opcode, Constant *C) {
   assert(Instruction::isUnaryOp(Opcode) && "Non-unary instruction detected");
 
-  // Handle scalar UndefValue. Vectors are always evaluated per element.
-  bool HasScalarUndef = !C->getType()->isVectorTy() && isa<UndefValue>(C);
+  switch (static_cast<Instruction::UnaryOps>(Opcode)) {
+  default:
+    break;
+  case Instruction::FNeg: {
+    // Handle scalar UndefValue. Vectors are always evaluated per element.
+    bool HasScalarUndef = !C->getType()->isVectorTy() && isa<UndefValue>(C);
 
-  if (HasScalarUndef) {
-    switch (static_cast<Instruction::UnaryOps>(Opcode)) {
-    case Instruction::FNeg:
+    if (HasScalarUndef) {
       return C; // -undef -> undef
-    case Instruction::UnaryOpsEnd:
-      llvm_unreachable("Invalid UnaryOp");
     }
-  }
 
-  // Constant should not be UndefValue, unless these are vector constants.
-  assert(!HasScalarUndef && "Unexpected UndefValue");
-  // We only have FP UnaryOps right now.
-  assert(!isa<ConstantInt>(C) && "Unexpected Integer UnaryOp");
+    // Constant should not be UndefValue, unless these are vector constants.
+    assert(!HasScalarUndef && "Unexpected UndefValue");
+    assert(!isa<ConstantInt>(C) && "Unexpected Integer UnaryOp");
 
-  if (ConstantFP *CFP = dyn_cast<ConstantFP>(C)) {
-    const APFloat &CV = CFP->getValueAPF();
-    switch (Opcode) {
-    default:
-      break;
-    case Instruction::FNeg:
+    if (ConstantFP *CFP = dyn_cast<ConstantFP>(C)) {
+      const APFloat &CV = CFP->getValueAPF();
       return ConstantFP::get(C->getContext(), neg(CV));
-    }
-  } else if (VectorType *VTy = dyn_cast<VectorType>(C->getType())) {
-    // Fold each element and create a vector constant from those constants.
-    SmallVector<Constant*, 16> Result;
-    Type *Ty = IntegerType::get(VTy->getContext(), 32);
-    for (unsigned i = 0, e = VTy->getNumElements(); i != e; ++i) {
-      Constant *ExtractIdx = ConstantInt::get(Ty, i);
-      Constant *Elt = ConstantExpr::getExtractElement(C, ExtractIdx);
+    } else if (VectorType *VTy = dyn_cast<VectorType>(C->getType())) {
+      // Fold each element and create a vector constant from those constants.
+      SmallVector<Constant*, 16> Result;
+      Type *Ty = IntegerType::get(VTy->getContext(), 32);
+      for (unsigned i = 0, e = VTy->getNumElements(); i != e; ++i) {
+        Constant *ExtractIdx = ConstantInt::get(Ty, i);
+        Constant *Elt = ConstantExpr::getExtractElement(C, ExtractIdx);
+
+        Result.push_back(ConstantExpr::get(Opcode, Elt));
+      }
 
-      Result.push_back(ConstantExpr::get(Opcode, Elt));
+      return ConstantVector::get(Result);
     }
-
-    return ConstantVector::get(Result);
+    break;
+  }
+  case Instruction::Freeze: {
+    if (ConstantFP *CFP = dyn_cast<ConstantFP>(C)) {
+      return CFP;
+    } else if (ConstantInt *CINT = dyn_cast<ConstantInt>(C)) {
+      return CINT;
+    } else if (GlobalVariable *GV = dyn_cast<GlobalVariable>(C)) {
+      // A global variable is neither undef nor poison.
+      return GV;
+    }
+    break;
+  }
+  case Instruction::UnaryOpsEnd:
+    llvm_unreachable("Invalid UnaryOp");
   }
 
   // We don't know how to fold this.