From 68d4d1d49c813d10047ad116e897a17d67112c10 Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Tue, 29 Jul 2008 20:56:02 +0000 Subject: [PATCH] Fix PR2609. If a label is deleted, then it needs to be marked invalid regardless of whether it is a debug, an exception handling or (hopefully) a GC label. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@54172 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/BranchFolding.cpp | 7 +- test/CodeGen/Generic/2008-07-29-EHLabel.ll | 282 +++++++++++++++++++++ 2 files changed, 285 insertions(+), 4 deletions(-) create mode 100644 test/CodeGen/Generic/2008-07-29-EHLabel.ll diff --git a/lib/CodeGen/BranchFolding.cpp b/lib/CodeGen/BranchFolding.cpp index f6b3d9cada5..00d927a77a2 100644 --- a/lib/CodeGen/BranchFolding.cpp +++ b/lib/CodeGen/BranchFolding.cpp @@ -114,15 +114,14 @@ void BranchFolder::RemoveDeadBlock(MachineBasicBlock *MBB) { while (!MBB->succ_empty()) MBB->removeSuccessor(MBB->succ_end()-1); - // If there is DWARF info to active, check to see if there are any DBG_LABEL - // records in the basic block. If so, unregister them from MachineModuleInfo. + // If there are any labels in the basic block, unregister them from + // MachineModuleInfo. if (MMI && !MBB->empty()) { for (MachineBasicBlock::iterator I = MBB->begin(), E = MBB->end(); I != E; ++I) { - if ((unsigned)I->getOpcode() == TargetInstrInfo::DBG_LABEL) { + if (I->isLabel()) // The label ID # is always operand #0, an immediate. MMI->InvalidateLabel(I->getOperand(0).getImm()); - } } } diff --git a/test/CodeGen/Generic/2008-07-29-EHLabel.ll b/test/CodeGen/Generic/2008-07-29-EHLabel.ll new file mode 100644 index 00000000000..69a4e132231 --- /dev/null +++ b/test/CodeGen/Generic/2008-07-29-EHLabel.ll @@ -0,0 +1,282 @@ +; RUN: llvm-as < %s | llc -o - | as -o /dev/null +; PR2609 + %struct..0._11 = type { i32 } + %struct..1__pthread_mutex_s = type { i32, i32, i32, i32, i32, %struct..0._11 } + %struct.pthread_attr_t = type { i32, [32 x i8] } + %struct.pthread_mutex_t = type { %struct..1__pthread_mutex_s } + %"struct.std::__ctype_abstract_base" = type { %"struct.std::locale::facet" } + %"struct.std::basic_ios >" = type { %"struct.std::ios_base", %"struct.std::basic_ostream >"*, i8, i8, %"struct.std::basic_streambuf >"*, %"struct.std::ctype"*, %"struct.std::__ctype_abstract_base"*, %"struct.std::__ctype_abstract_base"* } + %"struct.std::basic_istream >" = type { i32 (...)**, i32, %"struct.std::basic_ios >" } + %"struct.std::basic_istream >::sentry" = type { i8 } + %"struct.std::basic_ostream >" = type { i32 (...)**, %"struct.std::basic_ios >" } + %"struct.std::basic_streambuf >" = type { i32 (...)**, i8*, i8*, i8*, i8*, i8*, i8*, %"struct.std::locale" } + %"struct.std::ctype" = type { %"struct.std::locale::facet", i32*, i8, i32*, i32*, i16*, i8, [256 x i8], [256 x i8], i8 } + %"struct.std::ios_base" = type { i32 (...)**, i32, i32, i32, i32, i32, %"struct.std::ios_base::_Callback_list"*, %"struct.std::ios_base::_Words", [8 x %"struct.std::ios_base::_Words"], i32, %"struct.std::ios_base::_Words"*, %"struct.std::locale" } + %"struct.std::ios_base::_Callback_list" = type { %"struct.std::ios_base::_Callback_list"*, void (i32, %"struct.std::ios_base"*, i32)*, i32, i32 } + %"struct.std::ios_base::_Words" = type { i8*, i32 } + %"struct.std::locale" = type { %"struct.std::locale::_Impl"* } + %"struct.std::locale::_Impl" = type { i32, %"struct.std::locale::facet"**, i32, %"struct.std::locale::facet"**, i8** } + %"struct.std::locale::facet" = type { i32 (...)**, i32 } + +@_ZL20__gthrw_pthread_oncePiPFvvE = alias weak i32 (i32*, void ()*)* @pthread_once ; [#uses=0] +@_ZL27__gthrw_pthread_getspecificj = alias weak i8* (i32)* @pthread_getspecific ; [#uses=0] +@_ZL27__gthrw_pthread_setspecificjPKv = alias weak i32 (i32, i8*)* @pthread_setspecific ; [#uses=0] +@_ZL22__gthrw_pthread_createPmPK14pthread_attr_tPFPvS3_ES3_ = alias weak i32 (i32*, %struct.pthread_attr_t*, i8* (i8*)*, i8*)* @pthread_create ; [#uses=0] +@_ZL22__gthrw_pthread_cancelm = alias weak i32 (i32)* @pthread_cancel ; [#uses=0] +@_ZL26__gthrw_pthread_mutex_lockP15pthread_mutex_t = alias weak i32 (%struct.pthread_mutex_t*)* @pthread_mutex_lock ; [#uses=0] +@_ZL29__gthrw_pthread_mutex_trylockP15pthread_mutex_t = alias weak i32 (%struct.pthread_mutex_t*)* @pthread_mutex_trylock ; [#uses=0] +@_ZL28__gthrw_pthread_mutex_unlockP15pthread_mutex_t = alias weak i32 (%struct.pthread_mutex_t*)* @pthread_mutex_unlock ; [#uses=0] +@_ZL26__gthrw_pthread_mutex_initP15pthread_mutex_tPK19pthread_mutexattr_t = alias weak i32 (%struct.pthread_mutex_t*, %struct..0._11*)* @pthread_mutex_init ; [#uses=0] +@_ZL26__gthrw_pthread_key_createPjPFvPvE = alias weak i32 (i32*, void (i8*)*)* @pthread_key_create ; [#uses=0] +@_ZL26__gthrw_pthread_key_deletej = alias weak i32 (i32)* @pthread_key_delete ; [#uses=0] +@_ZL30__gthrw_pthread_mutexattr_initP19pthread_mutexattr_t = alias weak i32 (%struct..0._11*)* @pthread_mutexattr_init ; [#uses=0] +@_ZL33__gthrw_pthread_mutexattr_settypeP19pthread_mutexattr_ti = alias weak i32 (%struct..0._11*, i32)* @pthread_mutexattr_settype ; [#uses=0] +@_ZL33__gthrw_pthread_mutexattr_destroyP19pthread_mutexattr_t = alias weak i32 (%struct..0._11*)* @pthread_mutexattr_destroy ; [#uses=0] + +define %"struct.std::basic_istream >"* @_ZNSi7getlineEPcic(%"struct.std::basic_istream >"* %this, i8* %__s, i32 %__n, i8 signext %__delim) { +entry: + %__cerb = alloca %"struct.std::basic_istream >::sentry" ; <%"struct.std::basic_istream >::sentry"*> [#uses=2] + getelementptr %"struct.std::basic_istream >"* %this, i32 0, i32 1 ; :0 [#uses=7] + store i32 0, i32* %0, align 4 + call void @_ZNSi6sentryC1ERSib( %"struct.std::basic_istream >::sentry"* %__cerb, %"struct.std::basic_istream >"* %this, i8 zeroext 1 ) + getelementptr %"struct.std::basic_istream >::sentry"* %__cerb, i32 0, i32 0 ; :1 [#uses=1] + load i8* %1, align 8 ; :2 [#uses=1] + %toBool = icmp eq i8 %2, 0 ; [#uses=1] + br i1 %toBool, label %bb162, label %bb + +bb: ; preds = %entry + zext i8 %__delim to i32 ; :3 [#uses=1] + getelementptr %"struct.std::basic_istream >"* %this, i32 0, i32 0 ; :4 [#uses=1] + load i32 (...)*** %4, align 4 ; :5 [#uses=1] + getelementptr i32 (...)** %5, i32 -3 ; :6 [#uses=1] + bitcast i32 (...)** %6 to i32* ; :7 [#uses=1] + load i32* %7, align 4 ; :8 [#uses=1] + bitcast %"struct.std::basic_istream >"* %this to i8* ; :9 [#uses=1] + %ctg2186 = getelementptr i8* %9, i32 %8 ; [#uses=1] + bitcast i8* %ctg2186 to %"struct.std::basic_ios >"* ; <%"struct.std::basic_ios >"*>:10 [#uses=1] + getelementptr %"struct.std::basic_ios >"* %10, i32 0, i32 4 ; <%"struct.std::basic_streambuf >"**>:11 [#uses=1] + load %"struct.std::basic_streambuf >"** %11, align 4 ; <%"struct.std::basic_streambuf >"*>:12 [#uses=9] + getelementptr %"struct.std::basic_streambuf >"* %12, i32 0, i32 2 ; :13 [#uses=10] + load i8** %13, align 4 ; :14 [#uses=2] + getelementptr %"struct.std::basic_streambuf >"* %12, i32 0, i32 3 ; :15 [#uses=6] + load i8** %15, align 4 ; :16 [#uses=1] + icmp ult i8* %14, %16 ; :17 [#uses=1] + br i1 %17, label %bb81, label %bb82 + +bb81: ; preds = %bb + load i8* %14, align 1 ; :18 [#uses=1] + zext i8 %18 to i32 ; :19 [#uses=1] + %.pre = getelementptr %"struct.std::basic_streambuf >"* %12, i32 0, i32 0 ; [#uses=1] + br label %bb119.preheader + +bb82: ; preds = %bb + getelementptr %"struct.std::basic_streambuf >"* %12, i32 0, i32 0 ; :20 [#uses=2] + load i32 (...)*** %20, align 4 ; :21 [#uses=1] + getelementptr i32 (...)** %21, i32 9 ; :22 [#uses=1] + load i32 (...)** %22, align 4 ; :23 [#uses=1] + bitcast i32 (...)* %23 to i32 (%"struct.std::basic_streambuf >"*)* ; >"*)*>:24 [#uses=1] + invoke i32 %24( %"struct.std::basic_streambuf >"* %12 ) + to label %bb119.preheader unwind label %lpad ; :25 [#uses=1] + +bb119.preheader: ; preds = %bb82, %bb81 + %.pre-phi = phi i32 (...)*** [ %.pre, %bb81 ], [ %20, %bb82 ] ; [#uses=4] + %__c79.0.ph = phi i32 [ %19, %bb81 ], [ %25, %bb82 ] ; [#uses=1] + sext i8 %__delim to i32 ; :26 [#uses=1] + br label %bb119 + +bb84: ; preds = %bb119 + sub i32 %__n, %82 ; :27 [#uses=1] + add i32 %27, -1 ; :28 [#uses=2] + load i8** %15, align 4 ; :29 [#uses=1] + ptrtoint i8* %29 to i32 ; :30 [#uses=1] + load i8** %13, align 4 ; :31 [#uses=3] + ptrtoint i8* %31 to i32 ; :32 [#uses=2] + sub i32 %30, %32 ; :33 [#uses=2] + icmp slt i32 %28, %33 ; :34 [#uses=1] + select i1 %34, i32 %28, i32 %33 ; :35 [#uses=3] + icmp sgt i32 %35, 1 ; :36 [#uses=1] + br i1 %36, label %bb90, label %bb99 + +bb90: ; preds = %bb84 + call i8* @memchr( i8* %31, i32 %26, i32 %35 ) nounwind readonly ; :37 [#uses=2] + icmp eq i8* %37, null ; :38 [#uses=1] + br i1 %38, label %bb93, label %bb92 + +bb92: ; preds = %bb90 + ptrtoint i8* %37 to i32 ; :39 [#uses=1] + sub i32 %39, %32 ; :40 [#uses=1] + br label %bb93 + +bb93: ; preds = %bb92, %bb90 + %__size.0 = phi i32 [ %40, %bb92 ], [ %35, %bb90 ] ; [#uses=4] + call void @llvm.memcpy.i32( i8* %__s_addr.0, i8* %31, i32 %__size.0, i32 1 ) + getelementptr i8* %__s_addr.0, i32 %__size.0 ; :41 [#uses=3] + load i8** %13, align 4 ; :42 [#uses=1] + getelementptr i8* %42, i32 %__size.0 ; :43 [#uses=1] + store i8* %43, i8** %13, align 4 + load i32* %0, align 4 ; :44 [#uses=1] + add i32 %44, %__size.0 ; :45 [#uses=1] + store i32 %45, i32* %0, align 4 + load i8** %13, align 4 ; :46 [#uses=2] + load i8** %15, align 4 ; :47 [#uses=1] + icmp ult i8* %46, %47 ; :48 [#uses=1] + br i1 %48, label %bb95, label %bb96 + +bb95: ; preds = %bb93 + load i8* %46, align 1 ; :49 [#uses=1] + zext i8 %49 to i32 ; :50 [#uses=1] + br label %bb119 + +bb96: ; preds = %bb93 + load i32 (...)*** %.pre-phi, align 4 ; :51 [#uses=1] + getelementptr i32 (...)** %51, i32 9 ; :52 [#uses=1] + load i32 (...)** %52, align 4 ; :53 [#uses=1] + bitcast i32 (...)* %53 to i32 (%"struct.std::basic_streambuf >"*)* ; >"*)*>:54 [#uses=1] + invoke i32 %54( %"struct.std::basic_streambuf >"* %12 ) + to label %bb119 unwind label %lpad ; :55 [#uses=1] + +bb99: ; preds = %bb84 + trunc i32 %__c79.0 to i8 ; :56 [#uses=1] + store i8 %56, i8* %__s_addr.0, align 1 + getelementptr i8* %__s_addr.0, i32 1 ; :57 [#uses=5] + load i32* %0, align 4 ; :58 [#uses=1] + add i32 %58, 1 ; :59 [#uses=1] + store i32 %59, i32* %0, align 4 + load i8** %13, align 4 ; :60 [#uses=3] + load i8** %15, align 4 ; :61 [#uses=1] + icmp ult i8* %60, %61 ; :62 [#uses=1] + br i1 %62, label %bb101, label %bb102 + +bb101: ; preds = %bb99 + load i8* %60, align 1 ; :63 [#uses=1] + zext i8 %63 to i32 ; :64 [#uses=1] + getelementptr i8* %60, i32 1 ; :65 [#uses=1] + store i8* %65, i8** %13, align 4 + br label %bb104 + +bb102: ; preds = %bb99 + load i32 (...)*** %.pre-phi, align 4 ; :66 [#uses=1] + getelementptr i32 (...)** %66, i32 10 ; :67 [#uses=1] + load i32 (...)** %67, align 4 ; :68 [#uses=1] + bitcast i32 (...)* %68 to i32 (%"struct.std::basic_streambuf >"*)* ; >"*)*>:69 [#uses=1] + invoke i32 %69( %"struct.std::basic_streambuf >"* %12 ) + to label %bb104 unwind label %lpad ; :70 [#uses=1] + +bb104: ; preds = %bb102, %bb101 + %__ret44.0 = phi i32 [ %64, %bb101 ], [ %70, %bb102 ] ; [#uses=1] + icmp eq i32 %__ret44.0, -1 ; :71 [#uses=1] + br i1 %71, label %bb119, label %bb112 + +bb112: ; preds = %bb104 + load i8** %13, align 4 ; :72 [#uses=2] + load i8** %15, align 4 ; :73 [#uses=1] + icmp ult i8* %72, %73 ; :74 [#uses=1] + br i1 %74, label %bb114, label %bb115 + +bb114: ; preds = %bb112 + load i8* %72, align 1 ; :75 [#uses=1] + zext i8 %75 to i32 ; :76 [#uses=1] + br label %bb119 + +bb115: ; preds = %bb112 + load i32 (...)*** %.pre-phi, align 4 ; :77 [#uses=1] + getelementptr i32 (...)** %77, i32 9 ; :78 [#uses=1] + load i32 (...)** %78, align 4 ; :79 [#uses=1] + bitcast i32 (...)* %79 to i32 (%"struct.std::basic_streambuf >"*)* ; >"*)*>:80 [#uses=1] + invoke i32 %80( %"struct.std::basic_streambuf >"* %12 ) + to label %bb119 unwind label %lpad ; :81 [#uses=1] + +bb119: ; preds = %bb115, %bb114, %bb104, %bb96, %bb95, %bb119.preheader + %__c79.0 = phi i32 [ %__c79.0.ph, %bb119.preheader ], [ %50, %bb95 ], [ %76, %bb114 ], [ %55, %bb96 ], [ -1, %bb104 ], [ %81, %bb115 ] ; [#uses=3] + %__s_addr.0 = phi i8* [ %__s, %bb119.preheader ], [ %41, %bb95 ], [ %57, %bb114 ], [ %41, %bb96 ], [ %57, %bb104 ], [ %57, %bb115 ] ; [#uses=5] + load i32* %0, align 4 ; :82 [#uses=2] + add i32 %82, 1 ; :83 [#uses=2] + %.not = icmp sge i32 %83, %__n ; [#uses=1] + icmp eq i32 %__c79.0, -1 ; :84 [#uses=3] + icmp eq i32 %__c79.0, %3 ; :85 [#uses=2] + %or.cond = or i1 %84, %85 ; [#uses=1] + %or.cond188 = or i1 %or.cond, %.not ; [#uses=1] + br i1 %or.cond188, label %bb141, label %bb84 + +bb141: ; preds = %bb119 + %.not194 = xor i1 %85, true ; [#uses=1] + %brmerge = or i1 %84, %.not194 ; [#uses=1] + %.mux = select i1 %84, i32 2, i32 4 ; [#uses=0] + br i1 %brmerge, label %bb162, label %bb146 + +bb146: ; preds = %bb141 + store i32 %83, i32* %0, align 4 + load i8** %13, align 4 ; :86 [#uses=2] + load i8** %15, align 4 ; :87 [#uses=1] + icmp ult i8* %86, %87 ; :88 [#uses=1] + br i1 %88, label %bb148, label %bb149 + +bb148: ; preds = %bb146 + getelementptr i8* %86, i32 1 ; :89 [#uses=1] + store i8* %89, i8** %13, align 4 + ret %"struct.std::basic_istream >"* %this + +bb149: ; preds = %bb146 + load i32 (...)*** %.pre-phi, align 4 ; :90 [#uses=1] + getelementptr i32 (...)** %90, i32 10 ; :91 [#uses=1] + load i32 (...)** %91, align 4 ; :92 [#uses=1] + bitcast i32 (...)* %92 to i32 (%"struct.std::basic_streambuf >"*)* ; >"*)*>:93 [#uses=1] + invoke i32 %93( %"struct.std::basic_streambuf >"* %12 ) + to label %bb162 unwind label %lpad ; :94 [#uses=0] + +bb162: ; preds = %bb149, %bb141, %entry + ret %"struct.std::basic_istream >"* %this + +lpad: ; preds = %bb149, %bb115, %bb102, %bb96, %bb82 + %__s_addr.1 = phi i8* [ %__s, %bb82 ], [ %__s_addr.0, %bb149 ], [ %41, %bb96 ], [ %57, %bb102 ], [ %57, %bb115 ] ; [#uses=0] + call void @__cxa_rethrow( ) noreturn + unreachable +} + +declare i8* @__cxa_begin_catch(i8*) nounwind + +declare i8* @llvm.eh.exception() nounwind + +declare i32 @llvm.eh.selector.i32(i8*, i8*, ...) nounwind + +declare void @__cxa_rethrow() noreturn + +declare void @__cxa_end_catch() + +declare i32 @__gxx_personality_v0(...) + +declare void @_ZNSi6sentryC1ERSib(%"struct.std::basic_istream >::sentry"*, %"struct.std::basic_istream >"*, i8 zeroext ) + +declare i8* @memchr(i8*, i32, i32) nounwind readonly + +declare void @llvm.memcpy.i32(i8*, i8*, i32, i32) nounwind + +declare void @_ZNSt9basic_iosIcSt11char_traitsIcEE5clearESt12_Ios_Iostate(%"struct.std::basic_ios >"*, i32) + +declare extern_weak i32 @pthread_once(i32*, void ()*) + +declare extern_weak i8* @pthread_getspecific(i32) + +declare extern_weak i32 @pthread_setspecific(i32, i8*) + +declare extern_weak i32 @pthread_create(i32*, %struct.pthread_attr_t*, i8* (i8*)*, i8*) + +declare extern_weak i32 @pthread_cancel(i32) + +declare extern_weak i32 @pthread_mutex_lock(%struct.pthread_mutex_t*) + +declare extern_weak i32 @pthread_mutex_trylock(%struct.pthread_mutex_t*) + +declare extern_weak i32 @pthread_mutex_unlock(%struct.pthread_mutex_t*) + +declare extern_weak i32 @pthread_mutex_init(%struct.pthread_mutex_t*, %struct..0._11*) + +declare extern_weak i32 @pthread_key_create(i32*, void (i8*)*) + +declare extern_weak i32 @pthread_key_delete(i32) + +declare extern_weak i32 @pthread_mutexattr_init(%struct..0._11*) + +declare extern_weak i32 @pthread_mutexattr_settype(%struct..0._11*, i32) + +declare extern_weak i32 @pthread_mutexattr_destroy(%struct..0._11*) -- 2.34.1