This is an archive of the discontinued LLVM Phabricator instance.

Differential D47282

[DebugInfo] Maintain DI for sunken bitcasts
ClosedPublic

Authored by ergawy on May 23 2018, 2:39 PM.

Details

Reviewers
vsk
Group Reviewers
debug-info
Commits
rG9374c0432b9d: [DebugInfo] Maintain DI for sunken bitcasts
rL333133: [DebugInfo] Maintain DI for sunken bitcasts
Summary

When a bitcast is being sunk in -codegenprepare pass, its DI wasn't
copied over to the newly created instruction. This patch fixes that
bug.

Diff Detail

Event Timeline

ergawy created this revision.May 23 2018, 2:39 PM
Herald added subscribers: llvm-commits, JDevlieghere. · View Herald TranscriptMay 23 2018, 2:39 PM
ergawy added a reviewer: debug-info.May 23 2018, 2:41 PM
ergawy added a project: debug-info.May 23 2018, 2:45 PM
vsk accepted this revision.May 23 2018, 2:46 PM
vsk added a subscriber: vsk.

LGTM with a nitpick. Thanks!

test/DebugInfo/sink-bitcast-di.ll
1

This test doesn't rely on the output of -check-debugify, so you can just use "-debugify" here.

This revision is now accepted and ready to land.May 23 2018, 2:46 PM
Closed by commit rL333133: [DebugInfo] Maintain DI for sunken bitcasts (authored by vedantk). · Explain WhyMay 23 2018, 3:07 PM
This revision was automatically updated to reflect the committed changes.
vsk mentioned this in D49297: expose debugify as an LLVM option in clang.Jul 17 2018, 4:54 PM

Revision Contents

PathSize
lib/
CodeGen/
1 line
test/
DebugInfo/
35 lines

Diff 148288

lib/CodeGen/CodeGenPrepare.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 1,044 Lines • ▼ Show 20 Lines for (Value::user_iterator UI = CI->user_begin(), E = CI->user_end();
// If we have already inserted a cast into this block, use it. // If we have already inserted a cast into this block, use it.
CastInst *&InsertedCast = InsertedCasts[UserBB]; CastInst *&InsertedCast = InsertedCasts[UserBB];
if (!InsertedCast) { if (!InsertedCast) {
BasicBlock::iterator InsertPt = UserBB->getFirstInsertionPt(); BasicBlock::iterator InsertPt = UserBB->getFirstInsertionPt();
assert(InsertPt != UserBB->end()); assert(InsertPt != UserBB->end());
InsertedCast = CastInst::Create(CI->getOpcode(), CI->getOperand(0), InsertedCast = CastInst::Create(CI->getOpcode(), CI->getOperand(0),
CI->getType(), "", &*InsertPt); CI->getType(), "", &*InsertPt);
InsertedCast->setDebugLoc(CI->getDebugLoc());
} }
// Replace a use of the cast with a use of the new cast. // Replace a use of the cast with a use of the new cast.
TheUse = InsertedCast; TheUse = InsertedCast;
MadeChange = true; MadeChange = true;
++NumCastUses; ++NumCastUses;
} }
▲ Show 20 Lines • Show All 5,817 Lines • Show Last 20 Lines

test/DebugInfo/sink-bitcast-di.ll

  • This file was added.
; RUN: opt -S -enable-debugify -codegenprepare < %s | FileCheck %s
vskUnsubmitted
Not Done
ReplyInline Actions

This test doesn't rely on the output of -check-debugify, so you can just use "-debugify" here.

vsk: This test doesn't rely on the output of -check-debugify, so you can just use "-debugify" here.
target datalayout =
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128"
target triple = "x86_64-unknown-linux-gnu"
declare void @foo(i32)
declare void @slowpath(i32, i32*)
; Is DI maintained after sinking bitcast?
define void @test(i1 %cond, i64* %base) {
; CHECK-LABEL: @test
entry:
%addr = getelementptr inbounds i64, i64* %base, i64 5
%casted = bitcast i64* %addr to i32*
br i1 %cond, label %if.then, label %fallthrough
if.then:
; CHECK-LABEL: if.then:
; CHECK: bitcast i64* %addr to i32*, !dbg !{{[0-9]+}}
%v1 = load i32, i32* %casted, align 4
call void @foo(i32 %v1)
%cmp = icmp eq i32 %v1, 0
br i1 %cmp, label %rare.1, label %fallthrough
fallthrough:
ret void
rare.1:
; CHECK-LABEL: rare.1:
; CHECK: bitcast i64* %addr to i32*, !dbg !{{[0-9]+}}
call void @slowpath(i32 %v1, i32* %casted) ;; NOT COLD
br label %fallthrough
}