6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-14 11:32:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix several bugs:

Browse Source 
* Warnings were emitted all of the time and were really annoying
  * Functions could not be resolved unless they had external linkage.  Linkonce
    linkage was not allowed
  * ConstantPointerRef's were not handled when linking functions
    we now actually handle cast (CPR) to X -> cast (NewCPR) to X


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@5967 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2003-04-28 01:23:29 +00:00
parent b53a198613
commit 1fd95afab3
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/Transforms/IPO/FunctionResolution.cpp
View File

@ -128,7 +128,7 @@ static bool ResolveFunctions(Module &M, std::vector<GlobalValue*> &Globals,
const FunctionType *OldMT = Old->getFunctionType(); const FunctionType *OldMT = Old->getFunctionType();
const FunctionType *ConcreteMT = Concrete->getFunctionType(); const FunctionType *ConcreteMT = Concrete->getFunctionType();
if (OldMT->getParamTypes().size() < ConcreteMT->getParamTypes().size() && if (OldMT->getParamTypes().size() > ConcreteMT->getParamTypes().size() &&
!ConcreteMT->isVarArg()) !ConcreteMT->isVarArg())
if (!Old->use_empty()) { if (!Old->use_empty()) {
std::cerr << "WARNING: Linking function '" << Old->getName() std::cerr << "WARNING: Linking function '" << Old->getName()
@ -155,14 +155,13 @@ static bool ResolveFunctions(Module &M, std::vector<GlobalValue*> &Globals,
return Changed; return Changed;
} }
// Attempt to convert all of the uses of the old function to the // Attempt to convert all of the uses of the old function to the concrete
// concrete form of the function. If there is a use of the fn that // form of the function. If there is a use of the fn that we don't
// we don't understand here we punt to avoid making a bad // understand here we punt to avoid making a bad transformation.
// transformation.
// //
// At this point, we know that the return values are the same for // At this point, we know that the return values are the same for our two
// our two functions and that the Old function has no varargs fns // functions and that the Old function has no varargs fns specified. In
// specified. In otherwords it's just <retty> (...) // otherwords it's just <retty> (...)
// //
for (unsigned i = 0; i < Old->use_size(); ) { for (unsigned i = 0; i < Old->use_size(); ) {
User *U = *(Old->use_begin()+i); User *U = *(Old->use_begin()+i);
@ -183,6 +182,18 @@ static bool ResolveFunctions(Module &M, std::vector<GlobalValue*> &Globals,
<< " argument or something!" << CI; << " argument or something!" << CI;
++i; ++i;
} }
} else if (ConstantPointerRef *CPR = dyn_cast<ConstantPointerRef>(U)) {
if (CPR->use_size() == 1 && isa<ConstantExpr>(CPR->use_back()) &&
cast<ConstantExpr>(CPR->use_back())->getOpcode() ==
Instruction::Cast) {
ConstantExpr *CE = cast<ConstantExpr>(CPR->use_back());
Constant *NewCPR = ConstantPointerRef::get(Concrete);
CE->replaceAllUsesWith(ConstantExpr::getCast(NewCPR,CE->getType()));
CPR->destroyConstant();
} else {
std::cerr << "Cannot convert use of function: " << CPR << "\n";
++i;
}
} else { } else {
std::cerr << "Cannot convert use of function: " << U << "\n"; std::cerr << "Cannot convert use of function: " << U << "\n";
++i; ++i;
@ -337,7 +348,7 @@ bool FunctionResolvingPass::run(Module &M) {
GlobalValue *GV = cast<GlobalValue>(PI->second); GlobalValue *GV = cast<GlobalValue>(PI->second);
assert(PI->first == GV->getName() && assert(PI->first == GV->getName() &&
"Global name and symbol table do not agree!"); "Global name and symbol table do not agree!");
if (GV->hasExternalLinkage()) // Only resolve decls to external fns if (!GV->hasInternalLinkage()) // Only resolve decls to external fns
Globals[PI->first].push_back(GV); Globals[PI->first].push_back(GV);
} }
} }