[llvm-commits] [llvm] r112157 - in /llvm/trunk: lib/Linker/LinkModules.cpp lib/Transforms/Utils/CloneModule.cpp lib/Transforms/Utils/ValueMapper.cpp test/Linker/metadata-a.ll test/Linker/metadata-b.ll
Daniel Dunbar
daniel at zuster.org
Wed Aug 25 20:48:08 PDT 2010
Author: ddunbar
Date: Wed Aug 25 22:48:08 2010
New Revision: 112157
URL: http://llvm.org/viewvc/llvm-project?rev=112157&view=rev
Log:
Revert r112091, "Remap metadata attached to instructions when remapping
individual ...", which depends on r111922, which I am reverting.
Removed:
llvm/trunk/test/Linker/metadata-a.ll
llvm/trunk/test/Linker/metadata-b.ll
Modified:
llvm/trunk/lib/Linker/LinkModules.cpp
llvm/trunk/lib/Transforms/Utils/CloneModule.cpp
llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp
Modified: llvm/trunk/lib/Linker/LinkModules.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/LinkModules.cpp?rev=112157&r1=112156&r2=112157&view=diff
==============================================================================
--- llvm/trunk/lib/Linker/LinkModules.cpp (original)
+++ llvm/trunk/lib/Linker/LinkModules.cpp Wed Aug 25 22:48:08 2010
@@ -1005,31 +1005,13 @@
// the Source function as operands. Loop through all of the operands of the
// functions and patch them up to point to the local versions...
//
- // This is the same as RemapInstruction, except that it avoids remapping
- // instruction and basic block operands.
- //
for (Function::iterator BB = Dest->begin(), BE = Dest->end(); BB != BE; ++BB)
- for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I) {
- // Remap operands.
+ for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I)
for (Instruction::op_iterator OI = I->op_begin(), OE = I->op_end();
OI != OE; ++OI)
if (!isa<Instruction>(*OI) && !isa<BasicBlock>(*OI))
*OI = MapValue(*OI, ValueMap);
- // Remap attached metadata.
- SmallVector<std::pair<unsigned, MDNode *>, 4> MDs;
- I->getAllMetadata(MDs);
- for (SmallVectorImpl<std::pair<unsigned, MDNode *> >::iterator
- MI = MDs.begin(), ME = MDs.end(); MI != ME; ++MI) {
- Value *Old = MI->second;
- if (!isa<Instruction>(Old) && !isa<BasicBlock>(Old)) {
- Value *New = MapValue(Old, ValueMap);
- if (New != Old)
- I->setMetadata(MI->first, cast<MDNode>(New));
- }
- }
- }
-
// There is no need to map the arguments anymore.
for (Function::arg_iterator I = Src->arg_begin(), E = Src->arg_end();
I != E; ++I)
Modified: llvm/trunk/lib/Transforms/Utils/CloneModule.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/CloneModule.cpp?rev=112157&r1=112156&r2=112157&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/CloneModule.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/CloneModule.cpp Wed Aug 25 22:48:08 2010
@@ -132,5 +132,20 @@
NewNMD->addOperand(cast<MDNode>(MapValue(NMD.getOperand(i), VMap)));
}
+ // Update metadata attach with instructions.
+ for (Module::iterator MI = New->begin(), ME = New->end(); MI != ME; ++MI)
+ for (Function::iterator FI = MI->begin(), FE = MI->end();
+ FI != FE; ++FI)
+ for (BasicBlock::iterator BI = FI->begin(), BE = FI->end();
+ BI != BE; ++BI) {
+ SmallVector<std::pair<unsigned, MDNode *>, 4 > MDs;
+ BI->getAllMetadata(MDs);
+ for (SmallVector<std::pair<unsigned, MDNode *>, 4>::iterator
+ MDI = MDs.begin(), MDE = MDs.end(); MDI != MDE; ++MDI) {
+ Value *MappedValue = MapValue(MDI->second, VMap);
+ if (MDI->second != MappedValue && MappedValue)
+ BI->setMetadata(MDI->first, cast<MDNode>(MappedValue));
+ }
+ }
return New;
}
Modified: llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp?rev=112157&r1=112156&r2=112157&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp Wed Aug 25 22:48:08 2010
@@ -147,21 +147,10 @@
/// current values into those specified by VMap.
///
void llvm::RemapInstruction(Instruction *I, ValueToValueMapTy &VMap) {
- // Remap operands.
for (User::op_iterator op = I->op_begin(), E = I->op_end(); op != E; ++op) {
Value *V = MapValue(*op, VMap);
assert(V && "Referenced value not in value map!");
*op = V;
}
-
- // Remap attached metadata.
- SmallVector<std::pair<unsigned, MDNode *>, 4> MDs;
- I->getAllMetadata(MDs);
- for (SmallVectorImpl<std::pair<unsigned, MDNode *> >::iterator
- MI = MDs.begin(), ME = MDs.end(); MI != ME; ++MI) {
- Value *Old = MI->second;
- Value *New = MapValue(Old, VMap);
- if (New != Old)
- I->setMetadata(MI->first, cast<MDNode>(New));
- }
}
+
Removed: llvm/trunk/test/Linker/metadata-a.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/metadata-a.ll?rev=112156&view=auto
==============================================================================
--- llvm/trunk/test/Linker/metadata-a.ll (original)
+++ llvm/trunk/test/Linker/metadata-a.ll (removed)
@@ -1,15 +0,0 @@
-; RUN: llvm-link %s %p/metadata-b.ll -S -o - | FileCheck %s
-
-; CHECK: define void @foo(i32 %a)
-; CHECK: ret void, !attach !0, !also !{i32 %a}
-; CHECK: define void @goo(i32 %b)
-; CHECK: ret void, !attach !1, !and !{i32 %b}
-; CHECK: !0 = metadata !{i32 524334, void (i32)* @foo}
-; CHECK: !1 = metadata !{i32 524334, void (i32)* @goo}
-
-define void @foo(i32 %a) nounwind {
-entry:
- ret void, !attach !0, !also !{ i32 %a }
-}
-
-!0 = metadata !{i32 524334, void (i32)* @foo}
Removed: llvm/trunk/test/Linker/metadata-b.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/metadata-b.ll?rev=112156&view=auto
==============================================================================
--- llvm/trunk/test/Linker/metadata-b.ll (original)
+++ llvm/trunk/test/Linker/metadata-b.ll (removed)
@@ -1,9 +0,0 @@
-; This file is for use with metadata-a.ll
-; RUN: true
-
-define void @goo(i32 %b) nounwind {
-entry:
- ret void, !attach !0, !and !{ i32 %b }
-}
-
-!0 = metadata !{i32 524334, void (i32)* @goo}
More information about the llvm-commits
mailing list