From 305fcb1536b033c0dc924fb4d89d48a3baf2746f Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 28 Oct 2003 23:09:45 +0000 Subject: [PATCH] Fix PR62, and llvm/test/Regression/CBackend/2003-10-28-CastToPtrToStruct.ll ConstantExpr's can use unrelated types, make sure to scan them. llvm-svn: 9569 --- lib/Analysis/IPA/FindUsedTypes.cpp | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/lib/Analysis/IPA/FindUsedTypes.cpp b/lib/Analysis/IPA/FindUsedTypes.cpp index 91b599017e1..db5d64c0a0e 100644 --- a/lib/Analysis/IPA/FindUsedTypes.cpp +++ b/lib/Analysis/IPA/FindUsedTypes.cpp @@ -12,10 +12,11 @@ //===----------------------------------------------------------------------===// #include "llvm/Analysis/FindUsedTypes.h" -#include "llvm/Assembly/CachedWriter.h" -#include "llvm/SymbolTable.h" +#include "llvm/Constants.h" #include "llvm/DerivedTypes.h" #include "llvm/Module.h" +#include "llvm/SymbolTable.h" +#include "llvm/Assembly/CachedWriter.h" #include "llvm/Support/InstIterator.h" static RegisterAnalysis @@ -50,6 +51,18 @@ void FindUsedTypes::IncorporateSymbolTable(const SymbolTable &ST) { IncorporateType(cast(I->second)); } +void FindUsedTypes::IncorporateValue(const Value *V) { + IncorporateType(V->getType()); + + // If this is a constant, it could be using other types... + if (const Constant *C = dyn_cast(V)) { + for (User::const_op_iterator OI = C->op_begin(), OE = C->op_end(); + OI != OE; ++OI) + IncorporateValue(*OI); + } +} + + // run - This incorporates all types used by the specified module // bool FindUsedTypes::run(Module &m) { @@ -58,8 +71,11 @@ bool FindUsedTypes::run(Module &m) { IncorporateSymbolTable(m.getSymbolTable()); // Loop over global variables, incorporating their types - for (Module::const_giterator I = m.gbegin(), E = m.gend(); I != E; ++I) + for (Module::const_giterator I = m.gbegin(), E = m.gend(); I != E; ++I) { IncorporateType(I->getType()); + if (I->hasInitializer()) + IncorporateValue(I->getInitializer()); + } for (Module::iterator MI = m.begin(), ME = m.end(); MI != ME; ++MI) { IncorporateType(MI->getType()); @@ -77,8 +93,7 @@ bool FindUsedTypes::run(Module &m) { IncorporateType(Ty); // Incorporate the type of the instruction for (User::const_op_iterator OI = I->op_begin(), OE = I->op_end(); OI != OE; ++OI) - if ((*OI)->getType() != Ty) // Avoid set lookup in common case - IncorporateType((*OI)->getType());// Insert inst operand types as well + IncorporateValue(*OI); // Insert inst operand types as well } }