Patch for PR1045 and Transforms/ScalarRepl/2006-12-11-SROA-Crash.ll

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32468 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Transforms/Scalar/ScalarReplAggregates.cpp b/lib/Transforms/Scalar/ScalarReplAggregates.cpp
index 764cda69e367c83e7c7d81648c750d258eecaeeb..080d8115ff9ff4894c16a343ece15a7092ef6dcd 100644 (file)
--- a/lib/Transforms/Scalar/ScalarReplAggregates.cpp
+++ b/lib/Transforms/Scalar/ScalarReplAggregates.cpp
@@ -433,6 +433,8 @@ static bool MergeInType(const Type *In, const Type *&Accum,
   const PackedType *PTy;
   if (Accum == Type::VoidTy || In == Accum) {
     Accum = In;
+  } else if (In == Type::VoidTy) {
+    // Noop.
   } else if (In->isIntegral() && Accum->isIntegral()) {   // integer union.
     // Otherwise pick whichever type is larger.
     if (In->getTypeID() > Accum->getTypeID())