1 files changed, 11 insertions, 11 deletions
diff --git a/llvm/lib/CodeGen/SjLjEHPrepare.cpp b/llvm/lib/CodeGen/SjLjEHPrepare.cpp
index d2f39559486..f53408a0f12 100644
--- a/llvm/lib/CodeGen/SjLjEHPrepare.cpp
+++ b/llvm/lib/CodeGen/SjLjEHPrepare.cpp
@@ -249,18 +249,18 @@ void SjLjEHPrepare::lowerIncomingArguments(Function &F) {
        ++AI) {
     Type *Ty = AI->getType();
 
-    // Aggregate types can't be cast, but are legal argument types, so we have
-    // to handle them differently. We use an extract/insert pair as a
-    // lightweight method to achieve the same goal.
     if (isa<StructType>(Ty) || isa<ArrayType>(Ty)) {
-      Instruction *EI = ExtractValueInst::Create(AI, 0, "", AfterAllocaInsPt);
-      Instruction *NI = InsertValueInst::Create(AI, EI, 0);
-      NI->insertAfter(EI);
-      AI->replaceAllUsesWith(NI);
-
-      // Set the operand of the instructions back to the AllocaInst.
-      EI->setOperand(0, AI);
-      NI->setOperand(0, AI);
+      // Aggregate types can't be cast, but are legal argument types,
+      // so we have to handle them differently.  We use
+      // select i8 true, %arg, undef to achieve the same goal
+      Value *TrueValue = ConstantInt::getTrue(F.getContext());
+      Value *UndefValue = UndefValue::get(Ty);
+      Instruction *SI = SelectInst::Create(TrueValue, AI, UndefValue,
+                                           AI->getName() + ".tmp",
+                                           AfterAllocaInsPt);
+      AI->replaceAllUsesWith(SI);
+
+      SI->setOperand(1, AI);
     } else {
       // This is always a no-op cast because we're casting AI to AI->getType()
       // so src and destination types are identical. BitCast is the only