[llvm-commits] [llvm] r66731 - /llvm/branches/Apple/Dib/lib/Transforms/Scalar/InstructionCombining.cpp

[Bill Wendling]

Author: void
Date: Wed Mar 11 17:52:03 2009
New Revision: 66731

URL: http://llvm.org/viewvc/llvm-project?rev=66731&view=rev
Log:
--- Merging (from foreign repository) r66716 into '.':
U    lib/Transforms/Scalar/InstructionCombining.cpp

Skip interleaved debug info when fast-forwarding through
allocations.  Apparently the assumption is there is an
instruction (terminator?) following the allocation so I
am allowing the same assumption.

Modified:
    llvm/branches/Apple/Dib/lib/Transforms/Scalar/InstructionCombining.cpp

Modified: llvm/branches/Apple/Dib/lib/Transforms/Scalar/InstructionCombining.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/lib/Transforms/Scalar/InstructionCombining.cpp?rev=66731&r1=66730&r2=66731&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/lib/Transforms/Scalar/InstructionCombining.cpp (original)
+++ llvm/branches/Apple/Dib/lib/Transforms/Scalar/InstructionCombining.cpp Wed Mar 11 17:52:03 2009
@@ -10930,10 +10930,10 @@
       InsertNewInstBefore(New, AI);
 
       // Scan to the end of the allocation instructions, to skip over a block of
-      // allocas if possible...
+      // allocas if possible...also skip interleaved debug info
       //
       BasicBlock::iterator It = New;
-      while (isa<AllocationInst>(*It)) ++It;
+      while (isa<AllocationInst>(*It) || isa<DbgInfoIntrinsic>(*It)) ++It;
 
       // Now that I is pointing to the first non-allocation-inst in the block,
       // insert our getelementptr instruction...