[llvm-commits] [llvm] r111941 - in /llvm/trunk: include/llvm/Transforms/Utils/ValueMapper.h lib/Linker/LinkModules.cpp lib/Transforms/Utils/CloneFunction.cpp lib/Transforms/Utils/CloneModule.cpp lib/Transforms/Utils/ValueMapper.cpp lib/Transforms
Francois Pichet
pichet2000 at gmail.com
Tue Aug 24 23:41:03 PDT 2010
hi
This is breaking the CMake build. llvm-link doesn't link anymore.
Please update \tools\llvm-link\CMakeLists.txt and add the
transformutils dependency:
set(LLVM_LINK_COMPONENTS linker bitreader bitwriter asmparser transformutils)
On Tue, Aug 24, 2010 at 2:50 PM, Dan Gohman <gohman at apple.com> wrote:
> Author: djg
> Date: Tue Aug 24 13:50:07 2010
> New Revision: 111941
>
> URL: http://llvm.org/viewvc/llvm-project?rev=111941&view=rev
> Log:
> Use MapValue in the Linker instead of having a private function
> which does the same thing. This eliminates redundant code and
> handles MDNodes better. MDNode linking still doesn't fully
> work yet though.
>
> Added:
> llvm/trunk/include/llvm/Transforms/Utils/ValueMapper.h
> - copied, changed from r111917, llvm/trunk/lib/Transforms/Utils/ValueMapper.h
> Removed:
> llvm/trunk/lib/Transforms/Utils/ValueMapper.h
> Modified:
> llvm/trunk/lib/Linker/LinkModules.cpp
> llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp
> llvm/trunk/lib/Transforms/Utils/CloneModule.cpp
> llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp
>
> Copied: llvm/trunk/include/llvm/Transforms/Utils/ValueMapper.h (from r111917, llvm/trunk/lib/Transforms/Utils/ValueMapper.h)
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Transforms/Utils/ValueMapper.h?p2=llvm/trunk/include/llvm/Transforms/Utils/ValueMapper.h&p1=llvm/trunk/lib/Transforms/Utils/ValueMapper.h&r1=111917&r2=111941&rev=111941&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Utils/ValueMapper.h (original)
> +++ llvm/trunk/include/llvm/Transforms/Utils/ValueMapper.h Tue Aug 24 13:50:07 2010
> @@ -1,4 +1,4 @@
> -//===- ValueMapper.h - Interface shared by lib/Transforms/Utils -*- C++ -*-===//
> +//===- ValueMapper.h - Remapping for constants and metadata -----*- C++ -*-===//
> //
> // The LLVM Compiler Infrastructure
> //
> @@ -12,8 +12,8 @@
> //
> //===----------------------------------------------------------------------===//
>
> -#ifndef VALUEMAPPER_H
> -#define VALUEMAPPER_H
> +#ifndef LLVM_TRANSFORMS_UTILS_VALUEMAPPER_H
> +#define LLVM_TRANSFORMS_UTILS_VALUEMAPPER_H
>
> #include "llvm/ADT/ValueMap.h"
>
>
> Modified: llvm/trunk/lib/Linker/LinkModules.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/LinkModules.cpp?rev=111941&r1=111940&r2=111941&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Linker/LinkModules.cpp (original)
> +++ llvm/trunk/lib/Linker/LinkModules.cpp Tue Aug 24 13:50:07 2010
> @@ -29,6 +29,7 @@
> #include "llvm/Support/ErrorHandling.h"
> #include "llvm/Support/raw_ostream.h"
> #include "llvm/System/Path.h"
> +#include "llvm/Transforms/Utils/ValueMapper.h"
> #include "llvm/ADT/DenseMap.h"
> using namespace llvm;
>
> @@ -334,97 +335,6 @@
> return false;
> }
>
> -#ifndef NDEBUG
> -static void PrintMap(const std::map<const Value*, Value*> &M) {
> - for (std::map<const Value*, Value*>::const_iterator I = M.begin(), E =M.end();
> - I != E; ++I) {
> - dbgs() << " Fr: " << (const void*)I->first << " ";
> - I->first->dump();
> - dbgs() << " To: " << (const void*)I->second << " ";
> - I->second->dump();
> - dbgs() << "\n";
> - }
> -}
> -#endif
> -
> -
> -// RemapOperand - Use ValueMap to convert constants from one module to another.
> -static Value *RemapOperand(const Value *In,
> - std::map<const Value*, Value*> &ValueMap) {
> - std::map<const Value*,Value*>::const_iterator I = ValueMap.find(In);
> - if (I != ValueMap.end())
> - return I->second;
> -
> - // Check to see if it's a constant that we are interested in transforming.
> - Value *Result = 0;
> - if (const Constant *CPV = dyn_cast<Constant>(In)) {
> - if ((!isa<DerivedType>(CPV->getType()) && !isa<ConstantExpr>(CPV)) ||
> - isa<ConstantInt>(CPV) || isa<ConstantAggregateZero>(CPV))
> - return const_cast<Constant*>(CPV); // Simple constants stay identical.
> -
> - if (const ConstantArray *CPA = dyn_cast<ConstantArray>(CPV)) {
> - std::vector<Constant*> Operands(CPA->getNumOperands());
> - for (unsigned i = 0, e = CPA->getNumOperands(); i != e; ++i)
> - Operands[i] =cast<Constant>(RemapOperand(CPA->getOperand(i), ValueMap));
> - Result = ConstantArray::get(cast<ArrayType>(CPA->getType()), Operands);
> - } else if (const ConstantStruct *CPS = dyn_cast<ConstantStruct>(CPV)) {
> - std::vector<Constant*> Operands(CPS->getNumOperands());
> - for (unsigned i = 0, e = CPS->getNumOperands(); i != e; ++i)
> - Operands[i] =cast<Constant>(RemapOperand(CPS->getOperand(i), ValueMap));
> - Result = ConstantStruct::get(cast<StructType>(CPS->getType()), Operands);
> - } else if (isa<ConstantPointerNull>(CPV) || isa<UndefValue>(CPV)) {
> - Result = const_cast<Constant*>(CPV);
> - } else if (const ConstantVector *CP = dyn_cast<ConstantVector>(CPV)) {
> - std::vector<Constant*> Operands(CP->getNumOperands());
> - for (unsigned i = 0, e = CP->getNumOperands(); i != e; ++i)
> - Operands[i] = cast<Constant>(RemapOperand(CP->getOperand(i), ValueMap));
> - Result = ConstantVector::get(Operands);
> - } else if (const ConstantExpr *CE = dyn_cast<ConstantExpr>(CPV)) {
> - std::vector<Constant*> Ops;
> - for (unsigned i = 0, e = CE->getNumOperands(); i != e; ++i)
> - Ops.push_back(cast<Constant>(RemapOperand(CE->getOperand(i),ValueMap)));
> - Result = CE->getWithOperands(Ops);
> - } else if (const BlockAddress *CE = dyn_cast<BlockAddress>(CPV)) {
> - Result = BlockAddress::get(
> - cast<Function>(RemapOperand(CE->getFunction(), ValueMap)),
> - CE->getBasicBlock());
> - } else {
> - assert(!isa<GlobalValue>(CPV) && "Unmapped global?");
> - llvm_unreachable("Unknown type of derived type constant value!");
> - }
> - } else if (const MDNode *MD = dyn_cast<MDNode>(In)) {
> - if (MD->isFunctionLocal()) {
> - SmallVector<Value*, 4> Elts;
> - for (unsigned i = 0, e = MD->getNumOperands(); i != e; ++i) {
> - if (MD->getOperand(i))
> - Elts.push_back(RemapOperand(MD->getOperand(i), ValueMap));
> - else
> - Elts.push_back(NULL);
> - }
> - Result = MDNode::get(In->getContext(), Elts.data(), MD->getNumOperands());
> - } else {
> - Result = const_cast<Value*>(In);
> - }
> - } else if (isa<MDString>(In) || isa<InlineAsm>(In) || isa<Instruction>(In)) {
> - Result = const_cast<Value*>(In);
> - }
> -
> - // Cache the mapping in our local map structure
> - if (Result) {
> - ValueMap[In] = Result;
> - return Result;
> - }
> -
> -#ifndef NDEBUG
> - dbgs() << "LinkModules ValueMap: \n";
> - PrintMap(ValueMap);
> -
> - dbgs() << "Couldn't remap value: " << (const void*)In << " " << *In << "\n";
> - llvm_unreachable("Couldn't remap value!");
> -#endif
> - return 0;
> -}
> -
> /// ForceRenaming - The LLVM SymbolTable class autorenames globals that conflict
> /// in the symbol table. This is good for all clients except for us. Go
> /// through the trouble to force this back.
> @@ -555,7 +465,7 @@
> // LinkGlobals - Loop through the global variables in the src module and merge
> // them into the dest module.
> static bool LinkGlobals(Module *Dest, const Module *Src,
> - std::map<const Value*, Value*> &ValueMap,
> + ValueToValueMapTy &ValueMap,
> std::multimap<std::string, GlobalVariable *> &AppendingVars,
> std::string *Err) {
> ValueSymbolTable &DestSymTab = Dest->getValueSymbolTable();
> @@ -742,7 +652,7 @@
> // dest module. We're assuming, that all functions/global variables were already
> // linked in.
> static bool LinkAlias(Module *Dest, const Module *Src,
> - std::map<const Value*, Value*> &ValueMap,
> + ValueToValueMapTy &ValueMap,
> std::string *Err) {
> // Loop over all alias in the src module
> for (Module::const_alias_iterator I = Src->alias_begin(),
> @@ -753,7 +663,7 @@
>
> // Globals were already linked, thus we can just query ValueMap for variant
> // of SAliasee in Dest.
> - std::map<const Value*,Value*>::const_iterator VMI = ValueMap.find(SAliasee);
> + ValueToValueMapTy::const_iterator VMI = ValueMap.find(SAliasee);
> assert(VMI != ValueMap.end() && "Aliasee not linked");
> GlobalValue* DAliasee = cast<GlobalValue>(VMI->second);
> GlobalValue* DGV = NULL;
> @@ -884,7 +794,7 @@
> ForceRenaming(NewGA, SGA->getName());
>
> // Remember this mapping so uses in the source module get remapped
> - // later by RemapOperand.
> + // later by MapValue.
> ValueMap[SGA] = NewGA;
> }
>
> @@ -895,7 +805,7 @@
> // LinkGlobalInits - Update the initializers in the Dest module now that all
> // globals that may be referenced are in Dest.
> static bool LinkGlobalInits(Module *Dest, const Module *Src,
> - std::map<const Value*, Value*> &ValueMap,
> + ValueToValueMapTy &ValueMap,
> std::string *Err) {
> // Loop over all of the globals in the src module, mapping them over as we go
> for (Module::const_global_iterator I = Src->global_begin(),
> @@ -905,7 +815,7 @@
> if (SGV->hasInitializer()) { // Only process initialized GV's
> // Figure out what the initializer looks like in the dest module...
> Constant *SInit =
> - cast<Constant>(RemapOperand(SGV->getInitializer(), ValueMap));
> + cast<Constant>(MapValue(SGV->getInitializer(), ValueMap));
> // Grab destination global variable or alias.
> GlobalValue *DGV = cast<GlobalValue>(ValueMap[SGV]->stripPointerCasts());
>
> @@ -950,7 +860,7 @@
> // to the Dest function...
> //
> static bool LinkFunctionProtos(Module *Dest, const Module *Src,
> - std::map<const Value*, Value*> &ValueMap,
> + ValueToValueMapTy &ValueMap,
> std::string *Err) {
> ValueSymbolTable &DestSymTab = Dest->getValueSymbolTable();
>
> @@ -1035,7 +945,7 @@
> ForceRenaming(NewDF, SF->getName());
>
> // Remember this mapping so uses in the source module get remapped
> - // later by RemapOperand.
> + // later by MapValue.
> ValueMap[SF] = NewDF;
> continue;
> }
> @@ -1065,7 +975,7 @@
> // fix up references to values. At this point we know that Dest is an external
> // function, and that Src is not.
> static bool LinkFunctionBody(Function *Dest, Function *Src,
> - std::map<const Value*, Value*> &ValueMap,
> + ValueToValueMapTy &ValueMap,
> std::string *Err) {
> assert(Src && Dest && Dest->isDeclaration() && !Src->isDeclaration());
>
> @@ -1092,7 +1002,7 @@
> for (Instruction::op_iterator OI = I->op_begin(), OE = I->op_end();
> OI != OE; ++OI)
> if (!isa<Instruction>(*OI) && !isa<BasicBlock>(*OI))
> - *OI = RemapOperand(*OI, ValueMap);
> + *OI = MapValue(*OI, ValueMap);
>
> // There is no need to map the arguments anymore.
> for (Function::arg_iterator I = Src->arg_begin(), E = Src->arg_end();
> @@ -1107,7 +1017,7 @@
> // source module into the DestModule. This consists basically of copying the
> // function over and fixing up references to values.
> static bool LinkFunctionBodies(Module *Dest, Module *Src,
> - std::map<const Value*, Value*> &ValueMap,
> + ValueToValueMapTy &ValueMap,
> std::string *Err) {
>
> // Loop over all of the functions in the src module, mapping them over as we
> @@ -1315,8 +1225,10 @@
> return true;
>
> // ValueMap - Mapping of values from what they used to be in Src, to what they
> - // are now in Dest.
> - std::map<const Value*, Value*> ValueMap;
> + // are now in Dest. ValueToValueMapTy is a ValueMap, which involves some
> + // overhead due to the use of Value handles which the Linker doesn't actually
> + // need, but this allows us to reuse the ValueMapper code.
> + ValueToValueMapTy ValueMap;
>
> // AppendingVars - Keep track of global variables in the destination module
> // with appending linkage. After the module is linked together, they are
>
> Modified: llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp?rev=111941&r1=111940&r2=111941&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp (original)
> +++ llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp Tue Aug 24 13:50:07 2010
> @@ -23,7 +23,7 @@
> #include "llvm/LLVMContext.h"
> #include "llvm/Metadata.h"
> #include "llvm/Support/CFG.h"
> -#include "ValueMapper.h"
> +#include "llvm/Transforms/Utils/ValueMapper.h"
> #include "llvm/Analysis/ConstantFolding.h"
> #include "llvm/Analysis/DebugInfo.h"
> #include "llvm/ADT/SmallVector.h"
>
> Modified: llvm/trunk/lib/Transforms/Utils/CloneModule.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/CloneModule.cpp?rev=111941&r1=111940&r2=111941&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Utils/CloneModule.cpp (original)
> +++ llvm/trunk/lib/Transforms/Utils/CloneModule.cpp Tue Aug 24 13:50:07 2010
> @@ -17,7 +17,7 @@
> #include "llvm/DerivedTypes.h"
> #include "llvm/TypeSymbolTable.h"
> #include "llvm/Constant.h"
> -#include "ValueMapper.h"
> +#include "llvm/Transforms/Utils/ValueMapper.h"
> using namespace llvm;
>
> /// CloneModule - Return an exact copy of the specified module. This is not as
>
> Modified: llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp?rev=111941&r1=111940&r2=111941&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp (original)
> +++ llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp Tue Aug 24 13:50:07 2010
> @@ -12,7 +12,7 @@
> //
> //===----------------------------------------------------------------------===//
>
> -#include "ValueMapper.h"
> +#include "llvm/Transforms/Utils/ValueMapper.h"
> #include "llvm/Type.h"
> #include "llvm/Constants.h"
> #include "llvm/Function.h"
>
> Removed: llvm/trunk/lib/Transforms/Utils/ValueMapper.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/ValueMapper.h?rev=111940&view=auto
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Utils/ValueMapper.h (original)
> +++ llvm/trunk/lib/Transforms/Utils/ValueMapper.h (removed)
> @@ -1,29 +0,0 @@
> -//===- ValueMapper.h - Interface shared by lib/Transforms/Utils -*- C++ -*-===//
> -//
> -// The LLVM Compiler Infrastructure
> -//
> -// This file is distributed under the University of Illinois Open Source
> -// License. See LICENSE.TXT for details.
> -//
> -//===----------------------------------------------------------------------===//
> -//
> -// This file defines the MapValue interface which is used by various parts of
> -// the Transforms/Utils library to implement cloning and linking facilities.
> -//
> -//===----------------------------------------------------------------------===//
> -
> -#ifndef VALUEMAPPER_H
> -#define VALUEMAPPER_H
> -
> -#include "llvm/ADT/ValueMap.h"
> -
> -namespace llvm {
> - class Value;
> - class Instruction;
> - typedef ValueMap<const Value *, Value *> ValueToValueMapTy;
> -
> - Value *MapValue(const Value *V, ValueToValueMapTy &VM);
> - void RemapInstruction(Instruction *I, ValueToValueMapTy &VM);
> -} // End llvm namespace
> -
> -#endif
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
More information about the llvm-commits
mailing list