Skip to content

[20200108] Cherry-pick fixes for on-device testing. #629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 23, 2020
Merged

[20200108] Cherry-pick fixes for on-device testing. #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9752a61
[FastISel] Lower `llvm.dbg.value(undef, ...` correctly.
Jan 16, 2020
42a65e8
[TestQuoting] Use the fully qualified path for remote platforms.
Jan 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lldb/packages/Python/lldbsuite/test/commands/settings/quoting/TestQuoting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def do_test_args(self, args_in, args_out):

local_outfile = self.getBuildArtifact("output.txt")
if lldb.remote_platform:
remote_outfile = "output.txt" # Relative to platform's PWD
remote_outfile = lldb.remote_platform.GetWorkingDirectory() + "/output.txt"
else:
remote_outfile = local_outfile

Expand Down
7 changes: 3 additions & 4 deletions llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1412,9 +1412,9 @@ bool FastISel::selectIntrinsicCall(const IntrinsicInst *II) {
const Value *V = DI->getValue();
assert(DI->getVariable()->isValidLocationForIntrinsic(DbgLoc) &&
"Expected inlined-at fields to agree");
if (!V) {
if (!V || isa<UndefValue>(V)) {
// Currently the optimizer can produce this; insert an undef to
// help debugging. Probably the optimizer should not do this.
// help debugging.
BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DbgLoc, II, false, 0U,
DI->getVariable(), DI->getExpression());
} else if (const auto *CI = dyn_cast<ConstantInt>(V)) {
Expand Down Expand Up @@ -1442,8 +1442,7 @@ bool FastISel::selectIntrinsicCall(const IntrinsicInst *II) {
BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DbgLoc, II, IsIndirect, Reg,
DI->getVariable(), DI->getExpression());
} else {
// We can't yet handle anything else here because it would require
// generating code, thus altering codegen because of debug info.
// We don't know how to handle other cases, so we drop.
LLVM_DEBUG(dbgs() << "Dropping debug info for " << *DI << "\n");
}
return true;
Expand Down
30 changes: 30 additions & 0 deletions llvm/test/CodeGen/AArch64/fastisel-debugvalue-undef.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
; RUN: llc -O0 -fast-isel=1 -o - -print-after="finalize-isel" %s 2>&1 | FileCheck %s

; Check that we emit a DBG_VALUE for the `@llvm.dbg.value` which has `undef` has first arg.

target triple = "arm64-apple-ios13.4.0"
define void @foo() !dbg !6 {
; CHECK: DBG_VALUE $noreg, $noreg, !"1", !DIExpression()
call void @llvm.dbg.value(metadata i32* undef, metadata !9, metadata !DIExpression()), !dbg !11
ret void, !dbg !12
}

declare void @llvm.dbg.value(metadata, metadata, metadata)

!llvm.dbg.cu = !{!0}
!llvm.debugify = !{!3, !4}
!llvm.module.flags = !{!5}

!0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
!1 = !DIFile(filename: "t.ll", directory: "/")
!2 = !{}
!3 = !{i32 2}
!4 = !{i32 1}
!5 = !{i32 2, !"Debug Info Version", i32 3}
!6 = distinct !DISubprogram(name: "foo", linkageName: "foo", scope: null, file: !1, line: 1, type: !7, scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !8)
!7 = !DISubroutineType(types: !2)
!8 = !{!9}
!9 = !DILocalVariable(name: "1", scope: !6, file: !1, line: 1, type: !10)
!10 = !DIBasicType(name: "ty64", size: 64, encoding: DW_ATE_unsigned)
!11 = !DILocation(line: 1, column: 1, scope: !6)
!12 = !DILocation(line: 2, column: 1, scope: !6)