[llvm-commits] [llvm] r163616 - in /llvm/trunk: lib/CodeGen/StackColoring.cpp test/CodeGen/X86/StackColoring-dbg.ll

[Nadav Rotem]

Author: nadav
Date: Tue Sep 11 07:34:27 2012
New Revision: 163616

URL: http://llvm.org/viewvc/llvm-project?rev=163616&view=rev
Log:
Stack Coloring: Dont crash on dbg values which use stack frames.

Added:
    llvm/trunk/test/CodeGen/X86/StackColoring-dbg.ll
Modified:
    llvm/trunk/lib/CodeGen/StackColoring.cpp

Modified: llvm/trunk/lib/CodeGen/StackColoring.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/StackColoring.cpp?rev=163616&r1=163615&r2=163616&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/StackColoring.cpp (original)
+++ llvm/trunk/lib/CodeGen/StackColoring.cpp Tue Sep 11 07:34:27 2012
@@ -523,10 +523,12 @@
         // the calculated range then it means that the alloca usage moved
         // outside of the lifetime markers.
 #ifndef NDEBUG
-        SlotIndex Index = Indexes->getInstructionIndex(I);
-        LiveInterval* Interval = Intervals[FromSlot];
-        assert(Interval->find(Index) != Interval->end() &&
+        if (!I->isDebugValue()) {
+          SlotIndex Index = Indexes->getInstructionIndex(I);
+          LiveInterval* Interval = Intervals[FromSlot];
+          assert(Interval->find(Index) != Interval->end() &&
                "Found instruction usage outside of live range.");
+        }
 #endif
 
         // Fix the machine instructions.

Added: llvm/trunk/test/CodeGen/X86/StackColoring-dbg.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/StackColoring-dbg.ll?rev=163616&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/X86/StackColoring-dbg.ll (added)
+++ llvm/trunk/test/CodeGen/X86/StackColoring-dbg.ll Tue Sep 11 07:34:27 2012
@@ -0,0 +1,30 @@
+; RUN: llc -mcpu=corei7 -no-stack-coloring=false < %s
+
+; Make sure that we don't crash when dbg values are used.
+
+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-n8:16:32:64-S128"
+target triple = "x86_64-apple-macosx10.8.0"
+
+declare void @llvm.dbg.declare(metadata, metadata) nounwind readnone
+
+define void @foo() nounwind uwtable ssp {
+entry:
+  %x.i = alloca i8, align 1
+  %y.i = alloca [256 x i8], align 16
+  %0 = getelementptr inbounds [256 x i8]* %y.i, i64 0, i64 0
+  br label %for.body
+
+for.body:
+  call void @llvm.lifetime.end(i64 -1, i8* %0) nounwind
+  call void @llvm.lifetime.start(i64 -1, i8* %x.i) nounwind
+  call void @llvm.dbg.declare(metadata !{i8* %x.i}, metadata !22) nounwind
+  br label %for.body
+}
+
+declare void @llvm.lifetime.start(i64, i8* nocapture) nounwind
+
+declare void @llvm.lifetime.end(i64, i8* nocapture) nounwind
+
+!16 = metadata !{i32 786468, null, metadata !"char", null, i32 0, i64 8, i64 8, i64 0, i32 0, i32 6}
+!2 = metadata !{i32 0}
+!22 = metadata !{i32 786688, metadata !2, metadata !"x", metadata !2, i32 16, metadata !16, i32 0, i32 0}