[llvm-commits] [poolalloc] r156249 - in /poolalloc/trunk: lib/DSA/BottomUpClosure.cpp test/dsa/regression/2012-05-05.GlobalCtorsSCC.ll

[Will Dietz]

Author: wdietz2
Date: Sun May  6 00:28:30 2012
New Revision: 156249

URL: http://llvm.org/viewvc/llvm-project?rev=156249&view=rev
Log:
Fix failure when BU discovers an SCC while processing global_ctors.

(Use ValMap to avoid revisiting functions we already have visited, like
 is done when processing functions unreachable from main)

Also add corresponding regression test.

Added:
    poolalloc/trunk/test/dsa/regression/2012-05-05.GlobalCtorsSCC.ll
Modified:
    poolalloc/trunk/lib/DSA/BottomUpClosure.cpp

Modified: poolalloc/trunk/lib/DSA/BottomUpClosure.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/BottomUpClosure.cpp?rev=156249&r1=156248&r2=156249&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/BottomUpClosure.cpp (original)
+++ poolalloc/trunk/lib/DSA/BottomUpClosure.cpp Sun May  6 00:28:30 2012
@@ -253,8 +253,8 @@
           if (ConstantExpr *CE = dyn_cast<ConstantExpr>(FP))
             if (CE->isCast())
               FP = CE->getOperand(0);
-          if (Function *F = dyn_cast<Function>(FP)) {
-            if (F->isDeclaration()) continue;
+          Function *F = dyn_cast<Function>(FP);
+          if (F && !F->isDeclaration() && !ValMap.count(F)) {
             calculateGraphs(F, Stack, NextID, ValMap);
             CloneAuxIntoGlobal(getDSGraph(*F));
           }

Added: poolalloc/trunk/test/dsa/regression/2012-05-05.GlobalCtorsSCC.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/regression/2012-05-05.GlobalCtorsSCC.ll?rev=156249&view=auto
==============================================================================
--- poolalloc/trunk/test/dsa/regression/2012-05-05.GlobalCtorsSCC.ll (added)
+++ poolalloc/trunk/test/dsa/regression/2012-05-05.GlobalCtorsSCC.ll Sun May  6 00:28:30 2012
@@ -0,0 +1,18 @@
+;RUN: dsaopt %s -dsa-eq -disable-output
+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-unknown-linux-gnu"
+
+ at llvm.global_ctors = appending global [3 x { i32, void ()* }]
+  [{ i32, void ()* } { i32 0, void ()* @A },
+   { i32, void ()* } { i32 0, void ()* @B },
+   { i32, void ()* } { i32 0, void ()* @C }]
+
+declare void @A() nounwind
+define void @B() {
+  call void @C()
+  ret void
+}
+define void @C() {
+  call void @B()
+  ret void
+}