[llvm-branch-commits] [llvm-branch] r101849 - in /llvm/branches/Apple/Morbo: ./ include/llvm/Analysis/CallGraph.h lib/Analysis/IPA/CallGraph.cpp lib/Transforms/IPO/ArgumentPromotion.cpp test/Transforms/ArgumentPromotion/crash.ll
Bill Wendling
isanbard at gmail.com
Mon Apr 19 17:55:14 PDT 2010
Author: void
Date: Mon Apr 19 19:55:14 2010
New Revision: 101849
URL: http://llvm.org/viewvc/llvm-project?rev=101849&view=rev
Log:
$ svn merge -c 101845 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r101845 into '.':
A test/Transforms/ArgumentPromotion/crash.ll
U lib/Transforms/IPO/ArgumentPromotion.cpp
$ svn merge -c 101847 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r101847 into '.':
U include/llvm/Analysis/CallGraph.h
U lib/Analysis/IPA/CallGraph.cpp
Added:
llvm/branches/Apple/Morbo/test/Transforms/ArgumentPromotion/crash.ll
- copied unchanged from r101845, llvm/trunk/test/Transforms/ArgumentPromotion/crash.ll
Modified:
llvm/branches/Apple/Morbo/ (props changed)
llvm/branches/Apple/Morbo/include/llvm/Analysis/CallGraph.h
llvm/branches/Apple/Morbo/lib/Analysis/IPA/CallGraph.cpp
llvm/branches/Apple/Morbo/lib/Transforms/IPO/ArgumentPromotion.cpp
Propchange: llvm/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 19:55:14 2010
@@ -1,2 +1,2 @@
/llvm/branches/Apple/Hermes:96832,96835,96858,96870,96876,96879
-/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98768,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99196,99223,99263,99282-99284,99306,99319-99321,99324,99336,99378,99418,99423,99429,99440,99455,99463,99465,99469,99484,99490,99492-99494,99507,99524,99537,99539-99540,99544,99570,99575,99598,99620,99629-99630,99636,99671,99692,99695,99697,99699,99722,99816,99835-99836,99845-99846,99848,99850,99855,99879,99881-99883,99895,99899,99910,99916,99919,99952-99954,99957,99959,99974-99975,99982,99984-99986,99988,99992-99993,99995,99997-99999,100016,100035,100037-100038,100042,100044,100056,100072,100074,100078,100081-100090,100092,100094-100095,100116,100134,100184,100209,100214-100218,100220-100221,100223-100225,100231,100250,100252,100257,100261,100304,100332,100353,100384,100454-100455,100457,100466,100478,100480,100487,100494,100497,100505,100521,100553,100568,100584,100592,100609-100610,100636,100710,100736,100742,1007
51,100768-100769,100771,100781,100797,100804,100837,100867,100892,100936-100937,101011,101023,101075,101077,101079,101081,101085,101154,101158,101162,101165,101181,101190,101202,101282,101303,101314-101315,101317,101331,101343,101383,101392,101420,101453,101604,101615,101629,101684-101686,101805
+/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98768,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99196,99223,99263,99282-99284,99306,99319-99321,99324,99336,99378,99418,99423,99429,99440,99455,99463,99465,99469,99484,99490,99492-99494,99507,99524,99537,99539-99540,99544,99570,99575,99598,99620,99629-99630,99636,99671,99692,99695,99697,99699,99722,99816,99835-99836,99845-99846,99848,99850,99855,99879,99881-99883,99895,99899,99910,99916,99919,99952-99954,99957,99959,99974-99975,99982,99984-99986,99988,99992-99993,99995,99997-99999,100016,100035,100037-100038,100042,100044,100056,100072,100074,100078,100081-100090,100092,100094-100095,100116,100134,100184,100209,100214-100218,100220-100221,100223-100225,100231,100250,100252,100257,100261,100304,100332,100353,100384,100454-100455,100457,100466,100478,100480,100487,100494,100497,100505,100521,100553,100568,100584,100592,100609-100610,100636,100710,100736,100742,1007
51,100768-100769,100771,100781,100797,100804,100837,100867,100892,100936-100937,101011,101023,101075,101077,101079,101081,101085,101154,101158,101162,101165,101181,101190,101202,101282,101303,101314-101315,101317,101331,101343,101383,101392,101420,101453,101604,101615,101629,101684-101686,101805,101845,101847
Modified: llvm/branches/Apple/Morbo/include/llvm/Analysis/CallGraph.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/include/llvm/Analysis/CallGraph.h?rev=101849&r1=101848&r2=101849&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/include/llvm/Analysis/CallGraph.h (original)
+++ llvm/branches/Apple/Morbo/include/llvm/Analysis/CallGraph.h Mon Apr 19 19:55:14 2010
@@ -187,6 +187,9 @@
// CallGraphNode ctor - Create a node for the specified function.
inline CallGraphNode(Function *f) : F(f), NumReferences(0) {}
+ ~CallGraphNode() {
+ assert(NumReferences == 0 && "Node deleted while references remain");
+ }
//===---------------------------------------------------------------------
// Accessor methods.
@@ -277,6 +280,11 @@
/// time, so it should be used sparingly.
void replaceCallEdge(CallSite CS, CallSite NewCS, CallGraphNode *NewNode);
+ /// allReferencesDropped - This is a special function that should only be
+ /// used by the CallGraph class.
+ void allReferencesDropped() {
+ NumReferences = 0;
+ }
};
//===----------------------------------------------------------------------===//
Modified: llvm/branches/Apple/Morbo/lib/Analysis/IPA/CallGraph.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/Analysis/IPA/CallGraph.cpp?rev=101849&r1=101848&r2=101849&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/Analysis/IPA/CallGraph.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/Analysis/IPA/CallGraph.cpp Mon Apr 19 19:55:14 2010
@@ -158,6 +158,7 @@
// destroy - Release memory for the call graph
virtual void destroy() {
/// CallsExternalNode is not in the function map, delete it explicitly.
+ CallsExternalNode->allReferencesDropped();
delete CallsExternalNode;
CallsExternalNode = 0;
CallGraph::destroy();
@@ -181,6 +182,14 @@
void CallGraph::destroy() {
if (FunctionMap.empty()) return;
+ // Reset all node's use counts to zero before deleting them to prevent an
+ // assertion from firing.
+#ifndef NDEBUG
+ for (FunctionMapTy::iterator I = FunctionMap.begin(), E = FunctionMap.end();
+ I != E; ++I)
+ I->second->allReferencesDropped();
+#endif
+
for (FunctionMapTy::iterator I = FunctionMap.begin(), E = FunctionMap.end();
I != E; ++I)
delete I->second;
Modified: llvm/branches/Apple/Morbo/lib/Transforms/IPO/ArgumentPromotion.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/Transforms/IPO/ArgumentPromotion.cpp?rev=101849&r1=101848&r2=101849&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/Transforms/IPO/ArgumentPromotion.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/Transforms/IPO/ArgumentPromotion.cpp Mon Apr 19 19:55:14 2010
@@ -105,7 +105,7 @@
}
Changed |= LocalChange; // Remember that we changed something.
} while (LocalChange);
-
+
return Changed;
}
@@ -873,8 +873,14 @@
NF_CGN->stealCalledFunctionsFrom(CG[F]);
- // Now that the old function is dead, delete it.
- delete CG.removeFunctionFromModule(F);
+ // Now that the old function is dead, delete it. If there is a dangling
+ // reference to the CallgraphNode, just leave the dead function around for
+ // someone else to nuke.
+ CallGraphNode *CGN = CG[F];
+ if (CGN->getNumReferences() == 0)
+ delete CG.removeFunctionFromModule(CGN);
+ else
+ F->setLinkage(Function::ExternalLinkage);
return NF_CGN;
}
More information about the llvm-branch-commits
mailing list