From 99d60a1d0b35d6b8eda827351de6dd73f7a3dffe Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Tue, 12 May 2020 15:31:34 -0700 Subject: [PATCH] [GlobalISel] Assign the correct location when combining G_SEXT. --- .../GlobalISel/LegalizationArtifactCombiner.h | 2 +- .../AArch64/GlobalISel/combine-sext-debugloc.mir | 50 ++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 llvm/test/CodeGen/AArch64/GlobalISel/combine-sext-debugloc.mir diff --git a/llvm/include/llvm/CodeGen/GlobalISel/LegalizationArtifactCombiner.h b/llvm/include/llvm/CodeGen/GlobalISel/LegalizationArtifactCombiner.h index 252f2ed..60a0f3f 100644 --- a/llvm/include/llvm/CodeGen/GlobalISel/LegalizationArtifactCombiner.h +++ b/llvm/include/llvm/CodeGen/GlobalISel/LegalizationArtifactCombiner.h @@ -156,7 +156,7 @@ public: SmallVectorImpl &UpdatedDefs) { assert(MI.getOpcode() == TargetOpcode::G_SEXT); - Builder.setInstr(MI); + Builder.setInstrAndDebugLoc(MI); Register DstReg = MI.getOperand(0).getReg(); Register SrcReg = lookThroughCopyInstrs(MI.getOperand(1).getReg()); diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/combine-sext-debugloc.mir b/llvm/test/CodeGen/AArch64/GlobalISel/combine-sext-debugloc.mir new file mode 100644 index 0000000..4f44bad --- /dev/null +++ b/llvm/test/CodeGen/AArch64/GlobalISel/combine-sext-debugloc.mir @@ -0,0 +1,50 @@ +# RUN: llc -O0 -verify-machineinstrs -mtriple aarch64-- -run-pass=legalizer %s -o - | FileCheck %s + +# Check that when we combine SEXT we assign the correct debug location. +# CHECK: !9 = !DILocation(line: 36, column: 21, scope: !4) +# CHECK: G_AND %5, %4, debug-location !9 + +--- | + target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128" + target triple = "aarch64-unknown-unknown" + + define i64 @main(i8 %pat) personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) !dbg !4 { + entry: + %sext.1 = zext i8 %pat to i16, !dbg !8 + %sext.zext.1 = sext i16 %sext.1 to i64, !dbg !9 + ret i64 %sext.zext.1 + } + + declare void @printf(i8*, ...) + + declare i32 @__gxx_personality_v0(...) + + !llvm.dbg.cu = !{!0} + !llvm.module.flags = !{!2, !3} + + !0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 10.0.0", isOptimized: false, runtimeVersion: 0, emissionKind: LineTablesOnly, nameTableKind: None, sysroot: "/pata/tino", sdk: "iPhoneOS13.0.sdk") + !1 = !DIFile(filename: "/pata/tino/main.cpp", directory: "/pata/tino") + !2 = !{i32 2, !"Debug Info Version", i32 3} + !3 = !{i32 7, !"PIC Level", i32 2} + !4 = distinct !DISubprogram(name: "main", scope: !5, file: !5, line: 19, type: !6, scopeLine: 20, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0) + !5 = !DIFile(filename: "main.cpp", directory: "/pata/tino") + !6 = !DISubroutineType(types: !7) + !7 = !{} + !8 = !DILocation(line: 23, column: 5, scope: !4) + !9 = !DILocation(line: 36, column: 21, scope: !4) + +... +--- +name: main +body: | + bb.1.entry: + liveins: $w0 + + %1:_(s32) = COPY $w0 + %0:_(s8) = G_TRUNC %1(s32) + %2:_(s16) = G_ZEXT %0(s8), debug-location !8 + %3:_(s64) = G_SEXT %2(s16), debug-location !9 + $x0 = COPY %3(s64) + RET_ReallyLR implicit $x0 + +... -- 2.7.4