From 6687e3a1ed04c15310588ef29c9e003476675283 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Mon, 1 Aug 2016 18:06:34 +0000 Subject: [PATCH] [Verifier] Resume instructions can only be in functions w/ a personality This fixes PR28799. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@277360 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/IR/Verifier.cpp | 16 ++++++++++++++++ test/Transforms/ObjCARC/path-overflow.ll | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/IR/Verifier.cpp b/lib/IR/Verifier.cpp index d675ab98bf0..fd78fa3bb51 100644 --- a/lib/IR/Verifier.cpp +++ b/lib/IR/Verifier.cpp @@ -428,6 +428,7 @@ private: void visitInsertValueInst(InsertValueInst &IVI); void visitEHPadPredecessors(Instruction &I); void visitLandingPadInst(LandingPadInst &LPI); + void visitResumeInst(ResumeInst &RI); void visitCatchPadInst(CatchPadInst &CPI); void visitCatchReturnInst(CatchReturnInst &CatchReturn); void visitCleanupPadInst(CleanupPadInst &CPI); @@ -3298,6 +3299,21 @@ void Verifier::visitLandingPadInst(LandingPadInst &LPI) { visitInstruction(LPI); } +void Verifier::visitResumeInst(ResumeInst &RI) { + Assert(RI.getFunction()->hasPersonalityFn(), + "ResumeInst needs to be in a function with a personality.", &RI); + + if (!LandingPadResultTy) + LandingPadResultTy = RI.getValue()->getType(); + else + Assert(LandingPadResultTy == RI.getValue()->getType(), + "The resume instruction should have a consistent result type " + "inside a function.", + &RI); + + visitTerminatorInst(RI); +} + void Verifier::visitCatchPadInst(CatchPadInst &CPI) { BasicBlock *BB = CPI.getParent(); diff --git a/test/Transforms/ObjCARC/path-overflow.ll b/test/Transforms/ObjCARC/path-overflow.ll index 21fcc86f946..82c9fbe31b9 100644 --- a/test/Transforms/ObjCARC/path-overflow.ll +++ b/test/Transforms/ObjCARC/path-overflow.ll @@ -341,7 +341,7 @@ msgSend.cont507: ; preds = %msgSend.nullinit506 } ; Function Attrs: optsize ssp uwtable -define void @test2() unnamed_addr align 2 { +define void @test2() unnamed_addr align 2 personality i8* bitcast (i32 (...)* @__gxx_personality_sj0 to i8*) { bb: br i1 undef, label %bb3, label %bb2 -- 2.11.0