[llvm-commits] [llvm] r94331 - in /llvm/trunk: lib/Transforms/IPO/DeadArgumentElimination.cpp test/Transforms/DeadArgElim/deadexternal.ll
Nick Lewycky
nicholas at mxc.ca
Sat Jan 23 12:32:13 PST 2010
Author: nicholas
Date: Sat Jan 23 14:32:12 2010
New Revision: 94331
URL: http://llvm.org/viewvc/llvm-project?rev=94331&view=rev
Log:
Speculatively revert r94322 to see if it fixes darwin selfhost buildbot.
Removed:
llvm/trunk/test/Transforms/DeadArgElim/deadexternal.ll
Modified:
llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
Modified: llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp?rev=94331&r1=94330&r2=94331&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp Sat Jan 23 14:32:12 2010
@@ -30,7 +30,6 @@
#include "llvm/Support/CallSite.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/Transforms/Utils/Local.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/ADT/StringExtras.h"
@@ -51,7 +50,7 @@
/// argument. Used so that arguments and return values can be used
/// interchangably.
struct RetOrArg {
- RetOrArg(const Function *F, unsigned Idx, bool IsArg) : F(F), Idx(Idx),
+ RetOrArg(const Function* F, unsigned Idx, bool IsArg) : F(F), Idx(Idx),
IsArg(IsArg) {}
const Function *F;
unsigned Idx;
@@ -141,7 +140,6 @@
void MarkLive(const Function &F);
void PropagateLiveness(const RetOrArg &RA);
bool RemoveDeadStuffFromFunction(Function *F);
- bool RemoveDeadParamsFromCallersOf(Function *F);
bool DeleteDeadVarargs(Function &Fn);
};
}
@@ -282,7 +280,7 @@
/// for void functions and 1 for functions not returning a struct. It returns
/// the number of struct elements for functions returning a struct.
static unsigned NumRetVals(const Function *F) {
- if (F->getReturnType()->isVoidTy())
+ if (F->getReturnType() == Type::getVoidTy(F->getContext()))
return 0;
else if (const StructType *STy = dyn_cast<StructType>(F->getReturnType()))
return STy->getNumElements();
@@ -307,7 +305,7 @@
/// SurveyUse - This looks at a single use of an argument or return value
/// and determines if it should be alive or not. Adds this use to MaybeLiveUses
-/// if it causes the used value to become MaybeLive.
+/// if it causes the used value to become MaybeAlive.
///
/// RetValNum is the return value number to use when this use is used in a
/// return instruction. This is used in the recursion, you should always leave
@@ -398,7 +396,7 @@
// any callers use the return value. This fills in the LiveValues set and Uses
// map.
//
-// We consider arguments of overridable functions to be intrinsically alive as
+// We consider arguments of non-internal functions to be intrinsically alive as
// well as arguments to functions which have their "address taken".
//
void DAE::SurveyFunction(Function &F) {
@@ -422,16 +420,9 @@
return;
}
- if ((F.isDeclaration() || F.mayBeOverridden()) &&
- (!ShouldHackArguments() || F.isIntrinsic())) {
+ if (!F.hasLocalLinkage() && (!ShouldHackArguments() || F.isIntrinsic())) {
MarkLive(F);
return;
- } else if (!F.hasLocalLinkage()) {
- DEBUG(dbgs() << "DAE - Intrinsically live return from " << F.getName()
- << "\n");
- // Mark the return values alive.
- for (unsigned i = 0, e = NumRetVals(&F); i != e; ++i)
- MarkLive(CreateRet(&F, i));
}
DEBUG(dbgs() << "DAE - Inspecting callers for fn: " << F.getName() << "\n");
@@ -540,14 +531,14 @@
/// values (according to Uses) live as well.
void DAE::MarkLive(const Function &F) {
DEBUG(dbgs() << "DAE - Intrinsically live fn: " << F.getName() << "\n");
- // Mark the function as live.
- LiveFunctions.insert(&F);
- // Mark all arguments as live.
- for (unsigned i = 0, e = F.arg_size(); i != e; ++i)
- PropagateLiveness(CreateArg(&F, i));
- // Mark all return values as live.
- for (unsigned i = 0, e = NumRetVals(&F); i != e; ++i)
- PropagateLiveness(CreateRet(&F, i));
+ // Mark the function as live.
+ LiveFunctions.insert(&F);
+ // Mark all arguments as live.
+ for (unsigned i = 0, e = F.arg_size(); i != e; ++i)
+ PropagateLiveness(CreateArg(&F, i));
+ // Mark all return values as live.
+ for (unsigned i = 0, e = NumRetVals(&F); i != e; ++i)
+ PropagateLiveness(CreateRet(&F, i));
}
/// MarkLive - Mark the given return value or argument as live. Additionally,
@@ -612,8 +603,8 @@
// -1 means unused, other numbers are the new index
SmallVector<int, 5> NewRetIdxs(RetCount, -1);
std::vector<const Type*> RetTypes;
- if (RetTy->isVoidTy()) {
- NRetTy = RetTy;
+ if (RetTy == Type::getVoidTy(F->getContext())) {
+ NRetTy = Type::getVoidTy(F->getContext());
} else {
const StructType *STy = dyn_cast<StructType>(RetTy);
if (STy)
@@ -662,7 +653,7 @@
// values. Otherwise, ensure that we don't have any conflicting attributes
// here. Currently, this should not be possible, but special handling might be
// required when new return value attributes are added.
- if (NRetTy->isVoidTy())
+ if (NRetTy == Type::getVoidTy(F->getContext()))
RAttrs &= ~Attribute::typeIncompatible(NRetTy);
else
assert((RAttrs & Attribute::typeIncompatible(NRetTy)) == 0
@@ -714,7 +705,8 @@
}
// Create the new function type based on the recomputed parameters.
- FunctionType *NFTy = FunctionType::get(NRetTy, Params, FTy->isVarArg());
+ FunctionType *NFTy = FunctionType::get(NRetTy, Params,
+ FTy->isVarArg());
// No change?
if (NFTy == FTy)
@@ -799,7 +791,7 @@
// Return type not changed? Just replace users then.
Call->replaceAllUsesWith(New);
New->takeName(Call);
- } else if (New->getType()->isVoidTy()) {
+ } else if (New->getType() == Type::getVoidTy(F->getContext())) {
// Our return value has uses, but they will get removed later on.
// Replace by null for now.
Call->replaceAllUsesWith(Constant::getNullValue(Call->getType()));
@@ -875,7 +867,7 @@
if (ReturnInst *RI = dyn_cast<ReturnInst>(BB->getTerminator())) {
Value *RetVal;
- if (NFTy->getReturnType()->isVoidTy()) {
+ if (NFTy->getReturnType() == Type::getVoidTy(F->getContext())) {
RetVal = 0;
} else {
assert (isa<StructType>(RetTy));
@@ -916,42 +908,6 @@
return true;
}
-bool DAE::RemoveDeadParamsFromCallersOf(Function *F) {
- // Don't modify fully live functions
- if (LiveFunctions.count(F))
- return false;
-
- // Make a list of the dead arguments.
- SmallVector<int, 10> ArgDead;
- unsigned i = 0;
- for (Function::arg_iterator I = F->arg_begin(), E = F->arg_end();
- I != E; ++I, ++i) {
- RetOrArg Arg = CreateArg(F, i);
- if (!LiveValues.count(Arg))
- ArgDead.push_back(i);
- }
- if (ArgDead.empty())
- return false;
-
- bool MadeChange = false;
- for (Function::use_iterator I = F->use_begin(), E = F->use_end();
- I != E; ++I) {
- CallSite CS = CallSite::get(*I);
- if (CS.getInstruction() && CS.isCallee(I)) {
- for (unsigned i = 0, e = ArgDead.size(); i != e; ++i) {
- Value *A = CS.getArgument(ArgDead[i]);
- if (!isa<UndefValue>(A)) {
- MadeChange = true;
- CS.setArgument(ArgDead[i], UndefValue::get(A->getType()));
- RecursivelyDeleteTriviallyDeadInstructions(A);
- }
- }
- }
- }
-
- return MadeChange;
-}
-
bool DAE::runOnModule(Module &M) {
bool Changed = false;
@@ -975,15 +931,12 @@
SurveyFunction(*I);
// Now, remove all dead arguments and return values from each function in
- // turn.
+ // turn
for (Module::iterator I = M.begin(), E = M.end(); I != E; ) {
- // Increment now, because the function will probably get removed (ie.
+ // Increment now, because the function will probably get removed (ie
// replaced by a new one).
Function *F = I++;
- if (F->hasLocalLinkage())
- Changed |= RemoveDeadStuffFromFunction(F);
- else
- Changed |= RemoveDeadParamsFromCallersOf(F);
+ Changed |= RemoveDeadStuffFromFunction(F);
}
return Changed;
}
Removed: llvm/trunk/test/Transforms/DeadArgElim/deadexternal.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/DeadArgElim/deadexternal.ll?rev=94330&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/DeadArgElim/deadexternal.ll (original)
+++ llvm/trunk/test/Transforms/DeadArgElim/deadexternal.ll (removed)
@@ -1,12 +0,0 @@
-; RUN: opt -deadargelim -S %s | FileCheck %s
-
-define void @test(i32) {
- ret void
-}
-
-define void @foo() {
- call void @test(i32 0)
- ret void
-; CHECK: @foo
-; CHECK: i32 undef
-}
More information about the llvm-commits
mailing list