diff options
author | Reid Spencer <rspencer@reidspencer.com> | 2004-10-18 14:38:48 +0000 |
---|---|---|
committer | Reid Spencer <rspencer@reidspencer.com> | 2004-10-18 14:38:48 +0000 |
commit | 17e6e44298d8da4cd97ba0be66225cdad4670276 (patch) | |
tree | f41942b47af09d44ac0ee4f6987491726795ddba | |
parent | 698f96f7c81e45292ae4f5d76b8e06c88a88a71f (diff) | |
download | external_llvm-17e6e44298d8da4cd97ba0be66225cdad4670276.zip external_llvm-17e6e44298d8da4cd97ba0be66225cdad4670276.tar.gz external_llvm-17e6e44298d8da4cd97ba0be66225cdad4670276.tar.bz2 |
Correction to allow compilation with Visual C++.
Patch contributed by Morten Ofstad. Thanks Morten!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17123 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp | 4 | ||||
-rw-r--r-- | lib/Transforms/Scalar/LoopUnroll.cpp | 2 | ||||
-rw-r--r-- | lib/Transforms/Scalar/LowerGC.cpp | 4 | ||||
-rw-r--r-- | lib/Transforms/Utils/PromoteMemoryToRegister.cpp | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp b/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp index 10ef440..bd1fa51 100644 --- a/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp +++ b/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp @@ -638,7 +638,7 @@ void processGraph(Graph &g, #ifdef DEBUG_PATH_PROFILES //debugging info cerr<<"After moving dummy code\n"; - for(map<Edge, getEdgeCode *>::iterator cd_i=codeInsertions.begin(), + for(map<Edge, getEdgeCode *,EdgeCompare2>::iterator cd_i=codeInsertions.begin(), cd_e=codeInsertions.end(); cd_i != cd_e; ++cd_i){ printEdge(cd_i->first); cerr<<cd_i->second->getCond()<<":" @@ -650,7 +650,7 @@ void processGraph(Graph &g, //see what it looks like... //now insert code along edges which have codes on them - for(map<Edge, getEdgeCode *>::iterator MI=codeInsertions.begin(), + for(map<Edge, getEdgeCode *,EdgeCompare2>::iterator MI=codeInsertions.begin(), ME=codeInsertions.end(); MI!=ME; ++MI){ Edge ed=MI->first; insertBB(ed, MI->second, rInst, countInst, numPaths, MethNo, threshold); diff --git a/lib/Transforms/Scalar/LoopUnroll.cpp b/lib/Transforms/Scalar/LoopUnroll.cpp index 17fc35d..f87b2ca 100644 --- a/lib/Transforms/Scalar/LoopUnroll.cpp +++ b/lib/Transforms/Scalar/LoopUnroll.cpp @@ -30,6 +30,8 @@ #include "llvm/ADT/STLExtras.h" #include <cstdio> #include <set> +#include <algorithm> + using namespace llvm; namespace { diff --git a/lib/Transforms/Scalar/LowerGC.cpp b/lib/Transforms/Scalar/LowerGC.cpp index 2e03807..ee31688 100644 --- a/lib/Transforms/Scalar/LowerGC.cpp +++ b/lib/Transforms/Scalar/LowerGC.cpp @@ -143,8 +143,8 @@ static void Coerce(Instruction *I, unsigned OpNum, Type *Ty) { if (Constant *C = dyn_cast<Constant>(I->getOperand(OpNum))) I->setOperand(OpNum, ConstantExpr::getCast(C, Ty)); else { - CastInst *C = new CastInst(I->getOperand(OpNum), Ty, "", I); - I->setOperand(OpNum, C); + CastInst *CI = new CastInst(I->getOperand(OpNum), Ty, "", I); + I->setOperand(OpNum, CI); } } } diff --git a/lib/Transforms/Utils/PromoteMemoryToRegister.cpp b/lib/Transforms/Utils/PromoteMemoryToRegister.cpp index 3311bd1..213b3d7 100644 --- a/lib/Transforms/Utils/PromoteMemoryToRegister.cpp +++ b/lib/Transforms/Utils/PromoteMemoryToRegister.cpp @@ -220,8 +220,8 @@ void PromoteMem2Reg::run() { // (unspecified) ordering of basic blocks in the dominance frontier, // which would give PHI nodes non-determinstic subscripts. Fix this by // processing blocks in order of the occurance in the function. - for (DominanceFrontier::DomSetType::iterator P = S.begin(),PE = S.end(); - P != PE; ++P) + for (DominanceFrontier::DomSetType::const_iterator P = S.begin(), + PE = S.end(); P != PE; ++P) DFBlocks.push_back(BBNumbers.getNumber(*P)); // Sort by which the block ordering in the function. |