[llvm-commits] [llvm] r55895 - in /llvm/trunk: lib/Transforms/IPO/ArgumentPromotion.cpp test/Transforms/ArgumentPromotion/2008-09-07-CGUpdate.ll test/Transforms/ArgumentPromotion/2008-09-08-CGUpdateSelfEdge.ll

[Duncan Sands]

Author: baldrick
Date: Mon Sep  8 06:07:35 2008
New Revision: 55895

URL: http://llvm.org/viewvc/llvm-project?rev=55895&view=rev
Log:
Update the callgraph correctly in ArgumentPromotion.

Added:
    llvm/trunk/test/Transforms/ArgumentPromotion/2008-09-07-CGUpdate.ll
    llvm/trunk/test/Transforms/ArgumentPromotion/2008-09-08-CGUpdateSelfEdge.ll
Modified:
    llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp

Modified: llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp?rev=55895&r1=55894&r2=55895&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp Mon Sep  8 06:07:35 2008
@@ -607,6 +607,10 @@
   // changes.
   AliasAnalysis &AA = getAnalysis<AliasAnalysis>();
 
+  // Get the callgraph information that we need to update to reflect our
+  // changes.
+  CallGraph &CG = getAnalysis<CallGraph>();
+
   // Loop over all of the callers of the function, transforming the call sites
   // to pass in the loaded pointers.
   //
@@ -710,6 +714,9 @@
     // the old call with a new one.
     AA.replaceWithNewValue(Call, New);
 
+    // Update the callgraph to know that the callsite has been transformed.
+    CG[Call->getParent()->getParent()]->replaceCallSite(Call, New);
+
     if (!Call->use_empty()) {
       Call->replaceAllUsesWith(New);
       New->takeName(Call);

Added: llvm/trunk/test/Transforms/ArgumentPromotion/2008-09-07-CGUpdate.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ArgumentPromotion/2008-09-07-CGUpdate.ll?rev=55895&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/ArgumentPromotion/2008-09-07-CGUpdate.ll (added)
+++ llvm/trunk/test/Transforms/ArgumentPromotion/2008-09-07-CGUpdate.ll Mon Sep  8 06:07:35 2008
@@ -0,0 +1,12 @@
+; RUN: llvm-as < %s | opt -inline -argpromotion -disable-output
+
+define internal fastcc i32 @hash(i32* %ts, i32 %mod) nounwind {
+entry:
+	unreachable
+}
+
+define void @encode(i32* %m, i32* %ts, i32* %new) nounwind {
+entry:
+	%0 = call fastcc i32 @hash( i32* %ts, i32 0 ) nounwind		; <i32> [#uses=0]
+	unreachable
+}

Added: llvm/trunk/test/Transforms/ArgumentPromotion/2008-09-08-CGUpdateSelfEdge.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ArgumentPromotion/2008-09-08-CGUpdateSelfEdge.ll?rev=55895&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/ArgumentPromotion/2008-09-08-CGUpdateSelfEdge.ll (added)
+++ llvm/trunk/test/Transforms/ArgumentPromotion/2008-09-08-CGUpdateSelfEdge.ll Mon Sep  8 06:07:35 2008
@@ -0,0 +1,25 @@
+; RUN: llvm-as < %s | opt -argpromotion -disable-output
+
+define internal fastcc i32 @term_SharingList(i32* %Term, i32* %List) nounwind {
+entry:
+	br i1 false, label %bb, label %bb5
+
+bb:		; preds = %entry
+	%0 = call fastcc i32 @term_SharingList( i32* null, i32* %List ) nounwind		; <i32> [#uses=0]
+	unreachable
+
+bb5:		; preds = %entry
+	ret i32 0
+}
+
+define i32 @term_Sharing(i32* %Term) nounwind {
+entry:
+	br i1 false, label %bb.i, label %bb14
+
+bb.i:		; preds = %entry
+	%0 = call fastcc i32 @term_SharingList( i32* null, i32* null ) nounwind		; <i32> [#uses=0]
+	ret i32 1
+
+bb14:		; preds = %entry
+	ret i32 0
+}