mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-09-24 23:28:41 +00:00
Changes to build successfully with GCC 3.02
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1503 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
//
|
||||
static inline
|
||||
bool mergeDuplicateConstants(Module *M, unsigned &ConstantNo,
|
||||
map<Constant*, GlobalVariable*> &CMap) {
|
||||
std::map<Constant*, GlobalVariable*> &CMap) {
|
||||
Module::GlobalListType &GList = M->getGlobalList();
|
||||
if (GList.size() <= ConstantNo) return false; // No new constants
|
||||
bool MadeChanges = false;
|
||||
@@ -35,10 +35,10 @@ bool mergeDuplicateConstants(Module *M, unsigned &ConstantNo,
|
||||
Constant *Init = GV->getInitializer();
|
||||
|
||||
// Check to see if the initializer is already known...
|
||||
map<Constant*, GlobalVariable*>::iterator I = CMap.find(Init);
|
||||
std::map<Constant*, GlobalVariable*>::iterator I = CMap.find(Init);
|
||||
|
||||
if (I == CMap.end()) { // Nope, add it to the map
|
||||
CMap.insert(make_pair(Init, GV));
|
||||
CMap.insert(std::make_pair(Init, GV));
|
||||
} else { // Yup, this is a duplicate!
|
||||
// Make all uses of the duplicate constant use the cannonical version...
|
||||
GV->replaceAllUsesWith(I->second);
|
||||
@@ -59,7 +59,7 @@ bool mergeDuplicateConstants(Module *M, unsigned &ConstantNo,
|
||||
// deal with passes.
|
||||
//
|
||||
bool ConstantMerge::mergeDuplicateConstants(Module *M) {
|
||||
map<Constant*, GlobalVariable*> Constants;
|
||||
std::map<Constant*, GlobalVariable*> Constants;
|
||||
unsigned LastConstantSeen = 0;
|
||||
return ::mergeDuplicateConstants(M, LastConstantSeen, Constants);
|
||||
}
|
||||
|
Reference in New Issue
Block a user