[llvm-commits] [llvm] r113992 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

[Devang Patel]

Author: dpatel
Date: Wed Sep 15 13:13:55 2010
New Revision: 113992

URL: http://llvm.org/viewvc/llvm-project?rev=113992&view=rev
Log:
Check bb to ensure that alloca is in separate basic block.
This fixes funcargs.exp regression reported by gdb testsuite.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=113992&r1=113991&r2=113992&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Wed Sep 15 13:13:55 2010
@@ -4122,13 +4122,15 @@
         // If variable is pinned by a alloca in dominating bb then
         // use StaticAllocaMap.
         if (const AllocaInst *AI = dyn_cast<AllocaInst>(Address)) {
-          DenseMap<const AllocaInst*, int>::iterator SI =
-            FuncInfo.StaticAllocaMap.find(AI);
-          if (SI != FuncInfo.StaticAllocaMap.end()) {
-            SDV = DAG.getDbgValue(Variable, SI->second,
-                                  0, dl, SDNodeOrder);
-            DAG.AddDbgValue(SDV, 0, false);
-            return 0;
+          if (AI->getParent() != DI.getParent()) {
+            DenseMap<const AllocaInst*, int>::iterator SI =
+              FuncInfo.StaticAllocaMap.find(AI);
+            if (SI != FuncInfo.StaticAllocaMap.end()) {
+              SDV = DAG.getDbgValue(Variable, SI->second,
+                                    0, dl, SDNodeOrder);
+              DAG.AddDbgValue(SDV, 0, false);
+              return 0;
+            }
           }
         }
         // Otherwise add undef to help track missing debug info.