From e306d94782b1c608857738279852dcc050c66004 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 18 Jul 2002 02:31:03 +0000 Subject: [PATCH] * Rewrite loop to be slightly more efficient (arguably) * Fix a MAJOR thinko that was causing bad links to happen on Spec git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2953 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Linker/LinkModules.cpp | 4 ++-- lib/Transforms/Utils/Linker.cpp | 4 ++-- lib/VMCore/Linker.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index 094c46fef84..c23de0a1786 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -105,7 +105,7 @@ static Value *RemapOperand(const Value *In, map &LocalMap, if (const ConstantArray *CPA = dyn_cast(CPV)) { const std::vector &Ops = CPA->getValues(); std::vector Operands(Ops.size()); - for (unsigned i = 0; i < Ops.size(); ++i) + for (unsigned i = 0, e = Ops.size(); i != e; ++i) Operands[i] = cast(RemapOperand(Ops[i], LocalMap, GlobalMap)); Result = ConstantArray::get(cast(CPA->getType()), Operands); @@ -154,7 +154,7 @@ static Value *RemapOperand(const Value *In, map &LocalMap, } // Cache the mapping in our local map structure... - LocalMap.insert(std::make_pair(In, const_cast(CPV))); + LocalMap.insert(std::make_pair(In, Result)); return Result; } diff --git a/lib/Transforms/Utils/Linker.cpp b/lib/Transforms/Utils/Linker.cpp index 094c46fef84..c23de0a1786 100644 --- a/lib/Transforms/Utils/Linker.cpp +++ b/lib/Transforms/Utils/Linker.cpp @@ -105,7 +105,7 @@ static Value *RemapOperand(const Value *In, map &LocalMap, if (const ConstantArray *CPA = dyn_cast(CPV)) { const std::vector &Ops = CPA->getValues(); std::vector Operands(Ops.size()); - for (unsigned i = 0; i < Ops.size(); ++i) + for (unsigned i = 0, e = Ops.size(); i != e; ++i) Operands[i] = cast(RemapOperand(Ops[i], LocalMap, GlobalMap)); Result = ConstantArray::get(cast(CPA->getType()), Operands); @@ -154,7 +154,7 @@ static Value *RemapOperand(const Value *In, map &LocalMap, } // Cache the mapping in our local map structure... - LocalMap.insert(std::make_pair(In, const_cast(CPV))); + LocalMap.insert(std::make_pair(In, Result)); return Result; } diff --git a/lib/VMCore/Linker.cpp b/lib/VMCore/Linker.cpp index 094c46fef84..c23de0a1786 100644 --- a/lib/VMCore/Linker.cpp +++ b/lib/VMCore/Linker.cpp @@ -105,7 +105,7 @@ static Value *RemapOperand(const Value *In, map &LocalMap, if (const ConstantArray *CPA = dyn_cast(CPV)) { const std::vector &Ops = CPA->getValues(); std::vector Operands(Ops.size()); - for (unsigned i = 0; i < Ops.size(); ++i) + for (unsigned i = 0, e = Ops.size(); i != e; ++i) Operands[i] = cast(RemapOperand(Ops[i], LocalMap, GlobalMap)); Result = ConstantArray::get(cast(CPA->getType()), Operands); @@ -154,7 +154,7 @@ static Value *RemapOperand(const Value *In, map &LocalMap, } // Cache the mapping in our local map structure... - LocalMap.insert(std::make_pair(In, const_cast(CPV))); + LocalMap.insert(std::make_pair(In, Result)); return Result; } -- 2.34.1