forked from OSchip/llvm-project
Fix a bug that caused SimplifyCFG to drop DebugLocs.
Instruction::dropUnknownMetadata(KnownSet) is supposed to preserve all metadata in KnownSet, but the condition for DebugLocs was inverted. Most users of dropUnknownMetadata() actually worked around this by not adding LLVMContext::MD_dbg to their list of KnowIDs. This is now made explicit. llvm-svn: 245589
This commit is contained in:
parent
a317cd2583
commit
baf90fc265
|
@ -1062,7 +1062,7 @@ void Instruction::dropUnknownMetadata(ArrayRef<unsigned> KnownIDs) {
|
|||
KnownSet.insert(KnownIDs.begin(), KnownIDs.end());
|
||||
|
||||
// Drop debug if needed
|
||||
if (KnownSet.erase(LLVMContext::MD_dbg))
|
||||
if (!KnownSet.erase(LLVMContext::MD_dbg))
|
||||
DbgLoc = DebugLoc();
|
||||
|
||||
if (!hasMetadataHashEntry())
|
||||
|
|
|
@ -754,6 +754,7 @@ Instruction *InstCombiner::visitLoadInst(LoadInst &LI) {
|
|||
6, AA, &AATags)) {
|
||||
if (LoadInst *NLI = dyn_cast<LoadInst>(AvailableVal)) {
|
||||
unsigned KnownIDs[] = {
|
||||
LLVMContext::MD_dbg,
|
||||
LLVMContext::MD_tbaa,
|
||||
LLVMContext::MD_alias_scope,
|
||||
LLVMContext::MD_noalias,
|
||||
|
|
|
@ -1780,6 +1780,7 @@ static void patchReplacementInstruction(Instruction *I, Value *Repl) {
|
|||
// regions, and so we need a conservative combination of the noalias
|
||||
// scopes.
|
||||
static const unsigned KnownIDs[] = {
|
||||
LLVMContext::MD_dbg,
|
||||
LLVMContext::MD_tbaa,
|
||||
LLVMContext::MD_alias_scope,
|
||||
LLVMContext::MD_noalias,
|
||||
|
|
|
@ -743,6 +743,7 @@ bool MemCpyOpt::performCallSlotOptzn(Instruction *cpy,
|
|||
// FIXME: MD_tbaa_struct and MD_mem_parallel_loop_access should also be
|
||||
// handled here, but combineMetadata doesn't support them yet
|
||||
unsigned KnownIDs[] = {
|
||||
LLVMContext::MD_dbg,
|
||||
LLVMContext::MD_tbaa,
|
||||
LLVMContext::MD_alias_scope,
|
||||
LLVMContext::MD_noalias,
|
||||
|
|
|
@ -293,7 +293,7 @@ void MergedLoadStoreMotion::hoistInstruction(BasicBlock *BB,
|
|||
|
||||
// Intersect optional metadata.
|
||||
HoistCand->intersectOptionalDataWith(ElseInst);
|
||||
HoistCand->dropUnknownMetadata();
|
||||
HoistCand->dropUnknownMetadata(LLVMContext::MD_dbg);
|
||||
|
||||
// Prepend point for instruction insert
|
||||
Instruction *HoistPt = BB->getTerminator();
|
||||
|
@ -472,7 +472,7 @@ bool MergedLoadStoreMotion::sinkStore(BasicBlock *BB, StoreInst *S0,
|
|||
BasicBlock::iterator InsertPt = BB->getFirstInsertionPt();
|
||||
// Intersect optional metadata.
|
||||
S0->intersectOptionalDataWith(S1);
|
||||
S0->dropUnknownMetadata();
|
||||
S0->dropUnknownMetadata(LLVMContext::MD_dbg);
|
||||
|
||||
// Create the new store to be inserted at the join point.
|
||||
StoreInst *SNew = (StoreInst *)(S0->clone());
|
||||
|
|
|
@ -1093,6 +1093,7 @@ static bool HoistThenElseCodeToIf(BranchInst *BI,
|
|||
I2->replaceAllUsesWith(I1);
|
||||
I1->intersectOptionalDataWith(I2);
|
||||
unsigned KnownIDs[] = {
|
||||
LLVMContext::MD_dbg,
|
||||
LLVMContext::MD_tbaa,
|
||||
LLVMContext::MD_range,
|
||||
LLVMContext::MD_fpmath,
|
||||
|
|
|
@ -3118,6 +3118,7 @@ namespace {
|
|||
K->mutateType(getVecTypeForPair(L->getType(), H->getType()));
|
||||
|
||||
unsigned KnownIDs[] = {
|
||||
LLVMContext::MD_dbg,
|
||||
LLVMContext::MD_tbaa,
|
||||
LLVMContext::MD_alias_scope,
|
||||
LLVMContext::MD_noalias,
|
||||
|
|
|
@ -50,7 +50,7 @@ define i8 @test6f() {
|
|||
; CHECK: alloca i8, align 1
|
||||
; CHECK-NEXT: call i8 @test6g
|
||||
; CHECK-NEXT: icmp eq i8 %tmp, 0
|
||||
; CHECK-NEXT: load i8, i8* %r, align 1{{$}}
|
||||
; CHECK-NEXT: load i8, i8* %r, align 1, !dbg !{{[0-9]+$}}
|
||||
|
||||
bb0:
|
||||
%r = alloca i8, align 1
|
||||
|
@ -58,7 +58,7 @@ bb0:
|
|||
%tmp1 = icmp eq i8 %tmp, 0
|
||||
br i1 %tmp1, label %bb2, label %bb1
|
||||
bb1:
|
||||
%tmp3 = load i8, i8* %r, align 1, !range !2, !tbaa !1
|
||||
%tmp3 = load i8, i8* %r, align 1, !range !2, !tbaa !1, !dbg !5
|
||||
%tmp4 = icmp eq i8 %tmp3, 1
|
||||
br i1 %tmp4, label %bb2, label %bb3
|
||||
bb2:
|
||||
|
@ -69,6 +69,16 @@ bb3:
|
|||
}
|
||||
declare i8 @test6g(i8*)
|
||||
|
||||
!llvm.dbg.cu = !{!3}
|
||||
!llvm.module.flags = !{!8, !9}
|
||||
|
||||
!0 = !{!1, !1, i64 0}
|
||||
!1 = !{!"foo"}
|
||||
!2 = !{i8 0, i8 2}
|
||||
!3 = distinct !DICompileUnit(language: DW_LANG_C99, file: !7, producer: "clang", isOptimized: false, runtimeVersion: 0, emissionKind: 1, enums: !4, subprograms: !4, globals: !4)
|
||||
!4 = !{}
|
||||
!5 = !DILocation(line: 23, scope: !6)
|
||||
!6 = !DISubprogram(name: "foo", scope: !3, file: !7, line: 1, type: !DISubroutineType(types: !4), isLocal: false, isDefinition: true, scopeLine: 1, flags: DIFlagPrototyped, isOptimized: false, variables: !4)
|
||||
!7 = !DIFile(filename: "foo.c", directory: "/")
|
||||
!8 = !{i32 2, !"Dwarf Version", i32 2}
|
||||
!9 = !{i32 2, !"Debug Info Version", i32 3}
|
||||
|
|
Loading…
Reference in New Issue