From dcaab3b6818ff5421c7880527ce5f4f13b7daaee Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Tue, 21 Jan 2014 22:46:46 +0000 Subject: CodeGen: Stop treating vectors as aggregates Fix a crash in SjLjEHPrepare::lowerIncomingArguments caused by treating VectorType like an aggregate. It's first-class! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199768 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/SjLjEHPrepare.cpp | 2 +- test/CodeGen/Thumb/sjljehprepare-lower-vector.ll | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 test/CodeGen/Thumb/sjljehprepare-lower-vector.ll diff --git a/lib/CodeGen/SjLjEHPrepare.cpp b/lib/CodeGen/SjLjEHPrepare.cpp index da2e71045a..690e8b1aa2 100644 --- a/lib/CodeGen/SjLjEHPrepare.cpp +++ b/lib/CodeGen/SjLjEHPrepare.cpp @@ -251,7 +251,7 @@ void SjLjEHPrepare::lowerIncomingArguments(Function &F) { // 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(Ty) || isa(Ty) || isa(Ty)) { + if (isa(Ty) || isa(Ty)) { Instruction *EI = ExtractValueInst::Create(AI, 0, "", AfterAllocaInsPt); Instruction *NI = InsertValueInst::Create(AI, EI, 0); NI->insertAfter(EI); diff --git a/test/CodeGen/Thumb/sjljehprepare-lower-vector.ll b/test/CodeGen/Thumb/sjljehprepare-lower-vector.ll new file mode 100644 index 0000000000..ab082c79ba --- /dev/null +++ b/test/CodeGen/Thumb/sjljehprepare-lower-vector.ll @@ -0,0 +1,23 @@ +; RUN: llc -mtriple=thumbv7-apple-ios < %s +; SjLjEHPrepare shouldn't crash when lowering vectors. + +target datalayout = "e-p:32:32:32-i1:8:32-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:32:64-v128:32:128-a0:0:32-n32-S32" +target triple = "thumbv7-apple-ios" + +define i8* @foo(<4 x i32> %c) { +entry: + invoke void @bar () + to label %unreachable unwind label %handler + +unreachable: + unreachable + +handler: + %tmp = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @baz to i8*) + cleanup + resume { i8*, i32 } undef +} + +declare void @bar() +declare i32 @baz(...) + -- cgit v1.2.3