mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-15 04:30:12 +00:00
Fix some compilation errors on msvc:
- "Redefinition of I" (iterator masks previous definition) - include missing header file Patch by Argiris Kirtzidis! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48115 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
3c4a26226f
commit
58d5e05157
@ -597,9 +597,9 @@ static bool LinkAlias(Module *Dest, const Module *Src,
|
|||||||
|
|
||||||
// Globals were already linked, thus we can just query ValueMap for variant
|
// Globals were already linked, thus we can just query ValueMap for variant
|
||||||
// of SAliasee in Dest
|
// of SAliasee in Dest
|
||||||
std::map<const Value*,Value*>::const_iterator I = ValueMap.find(SAliasee);
|
std::map<const Value*,Value*>::const_iterator VMI = ValueMap.find(SAliasee);
|
||||||
assert(I != ValueMap.end() && "Aliasee not linked");
|
assert(VMI != ValueMap.end() && "Aliasee not linked");
|
||||||
GlobalValue* DAliasee = cast<GlobalValue>(I->second);
|
GlobalValue* DAliasee = cast<GlobalValue>(VMI->second);
|
||||||
|
|
||||||
// Try to find something 'similar' to SGA in destination module.
|
// Try to find something 'similar' to SGA in destination module.
|
||||||
if (GlobalAlias *DGA = Dest->getNamedAlias(SGA->getName())) {
|
if (GlobalAlias *DGA = Dest->getNamedAlias(SGA->getName())) {
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
#include "llvm/Constants.h"
|
#include "llvm/Constants.h"
|
||||||
#include "llvm/Transforms/IPO.h"
|
#include "llvm/Transforms/IPO.h"
|
||||||
#include "llvm/Support/Compiler.h"
|
#include "llvm/Support/Compiler.h"
|
||||||
|
#include <algorithm>
|
||||||
using namespace llvm;
|
using namespace llvm;
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
Loading…
Reference in New Issue
Block a user