From a30fc5ed0430081f6495b33e027b7655ca2a66e5 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 12 Dec 2006 04:24:41 +0000 Subject: [PATCH] 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 --- lib/Transforms/Scalar/ScalarReplAggregates.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/Transforms/Scalar/ScalarReplAggregates.cpp b/lib/Transforms/Scalar/ScalarReplAggregates.cpp index 764cda69e36..080d8115ff9 100644 --- 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())