[llvm] r341290 - Revert "[DebugInfo] Fix bug in LiveDebugVariables."
Hsiangkai Wang via llvm-commits
llvm-commits at lists.llvm.org
Sun Sep 2 09:35:43 PDT 2018
Author: hsiangkai
Date: Sun Sep 2 09:35:42 2018
New Revision: 341290
URL: http://llvm.org/viewvc/llvm-project?rev=341290&view=rev
Log:
Revert "[DebugInfo] Fix bug in LiveDebugVariables."
This reverts commit 8f548ff2a1819e1bc051e8218584f1a3d2cf178a.
buildbot failure in LLVM on clang-ppc64be-linux
http://lab.llvm.org:8011/builders/clang-ppc64le-linux/builds/19765
Removed:
llvm/trunk/test/DebugInfo/X86/live-debug-vars-index.mir
Modified:
llvm/trunk/include/llvm/CodeGen/SlotIndexes.h
llvm/trunk/lib/CodeGen/LiveDebugVariables.cpp
Modified: llvm/trunk/include/llvm/CodeGen/SlotIndexes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SlotIndexes.h?rev=341290&r1=341289&r2=341290&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/SlotIndexes.h (original)
+++ llvm/trunk/include/llvm/CodeGen/SlotIndexes.h Sun Sep 2 09:35:42 2018
@@ -414,8 +414,6 @@ class raw_ostream;
SlotIndex getInstructionIndex(const MachineInstr &MI) const {
// Instructions inside a bundle have the same number as the bundle itself.
const MachineInstr &BundleStart = *getBundleStart(MI.getIterator());
- assert(!BundleStart.isDebugInstr() &&
- "Could not use a debug instruction to query mi2iMap.");
Mi2IndexMap::const_iterator itr = mi2iMap.find(&BundleStart);
assert(itr != mi2iMap.end() && "Instruction not found in maps.");
return itr->second;
Modified: llvm/trunk/lib/CodeGen/LiveDebugVariables.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveDebugVariables.cpp?rev=341290&r1=341289&r2=341290&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/LiveDebugVariables.cpp (original)
+++ llvm/trunk/lib/CodeGen/LiveDebugVariables.cpp Sun Sep 2 09:35:42 2018
@@ -578,28 +578,23 @@ bool LDVImpl::collectDebugValues(Machine
MachineBasicBlock *MBB = &*MFI;
for (MachineBasicBlock::iterator MBBI = MBB->begin(), MBBE = MBB->end();
MBBI != MBBE;) {
- // Use the first debug instruction in the sequence to get a SlotIndex
- // for following consecutive debug instructions.
- if (!MBBI->isDebugInstr()) {
+ if (!MBBI->isDebugValue()) {
++MBBI;
continue;
}
- // Debug instructions has no slot index. Use the previous
- // non-debug instruction's SlotIndex as its SlotIndex.
+ // DBG_VALUE has no slot index, use the previous instruction instead.
SlotIndex Idx =
MBBI == MBB->begin()
? LIS->getMBBStartIdx(MBB)
: LIS->getInstructionIndex(*std::prev(MBBI)).getRegSlot();
- // Handle consecutive debug instructions with the same slot index.
+ // Handle consecutive DBG_VALUE instructions with the same slot index.
do {
- // Only handle DBG_VALUE in handleDebugValue(). Skip all other
- // kinds of debug instructions.
- if (MBBI->isDebugValue() && handleDebugValue(*MBBI, Idx)) {
+ if (handleDebugValue(*MBBI, Idx)) {
MBBI = MBB->erase(MBBI);
Changed = true;
} else
++MBBI;
- } while (MBBI != MBBE && MBBI->isDebugInstr());
+ } while (MBBI != MBBE && MBBI->isDebugValue());
}
}
return Changed;
Removed: llvm/trunk/test/DebugInfo/X86/live-debug-vars-index.mir
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/live-debug-vars-index.mir?rev=341289&view=auto
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/live-debug-vars-index.mir (original)
+++ llvm/trunk/test/DebugInfo/X86/live-debug-vars-index.mir (removed)
@@ -1,51 +0,0 @@
-# After adding new debug instruction for labels, it is possible to have
-# debug instructions before DBG_VALUE. When querying DBG_VALUE's slot
-# index using previous instruction and the previous instruction is debug
-# instruction, it will trigger an assertion as using debug instruction
-# to get slot index. This test is to emulate the case when DBG_VALUE's
-# previous instruction is DBG_LABEL in LiveDebugVariables pass.
-#
-# RUN: llc -run-pass=livedebugvars -run-pass=virtregrewriter -o - %s | FileCheck %s
-
---- |
- define i32 @foo(i32 %a, i32 %b) !dbg !4 {
- entry:
- ret i32 0, !dbg !12
- }
-
- !llvm.dbg.cu = !{!0}
- !llvm.module.flags = !{!3}
-
- !0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
- !1 = !DIFile(filename: "debug-var-slot.c", directory: "./")
- !2 = !{}
- !3 = !{i32 2, !"Debug Info Version", i32 3}
- !4 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 1, type: !5, isLocal: false, isDefinition: true, scopeLine: 2, isOptimized: true, unit: !0, retainedNodes: !2)
- !5 = !DISubroutineType(types: !6)
- !6 = !{!7, !7, !7}
- !7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
- !8 = !DILabel(scope: !4, name: "top", file: !1, line: 4)
- !9 = !DILocation(line: 4, column: 1, scope: !4)
- !10 = !DILocalVariable(name: "local_var", scope: !4, file: !1, line: 7, type: !7)
- !11 = !DILocation(line: 7, column: 1, scope: !4)
- !12 = !DILocation(line: 8, column: 3, scope: !4)
- !13 = !DILocalVariable(name: "local_var2", scope: !4, file: !1, line: 7, type: !7)
-
-...
----
-name: foo
-tracksRegLiveness: true
-body: |
- bb.0:
-
- DBG_VALUE debug-use $esi, debug-use $noreg, !13, !DIExpression(), debug-location !11
- DBG_LABEL !8, debug-location !9
- DBG_VALUE debug-use $edi, debug-use $noreg, !10, !DIExpression(), debug-location !11
- RET 0, undef $eax, debug-location !12
-...
-
-# CHECK-LABEL: name: foo
-# CHECK: bb.0:
-# CHECK-DAG: DBG_LABEL
-# CHECK-DAG: DBG_VALUE debug-use $esi
-# CHECK-DAG: DBG_VALUE debug-use $edi
More information about the llvm-commits
mailing list