diff options
| author | Devang Patel <dpatel@apple.com> | 2011-07-14 22:14:06 +0000 |
|---|---|---|
| committer | Devang Patel <dpatel@apple.com> | 2011-07-14 22:14:06 +0000 |
| commit | af29322bb308a7e02203fd6cc404f5c7f8d7f651 (patch) | |
| tree | 60a214474f74bb843abf84b96b96f4fa5e54a378 /lib/Transforms/Utils/ValueMapper.cpp | |
| parent | 2959ebd14d1f98095678ae6bd8bb52ee456313cd (diff) | |
| download | llvm-af29322bb308a7e02203fd6cc404f5c7f8d7f651.tar.gz llvm-af29322bb308a7e02203fd6cc404f5c7f8d7f651.tar.bz2 llvm-af29322bb308a7e02203fd6cc404f5c7f8d7f651.tar.xz | |
Undo r135191 (i.e. reapply Chris's patch. Now linker maps NamedMDNodes first, so there is not any need to map DebugLoc).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135205 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Utils/ValueMapper.cpp')
| -rw-r--r-- | lib/Transforms/Utils/ValueMapper.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Transforms/Utils/ValueMapper.cpp b/lib/Transforms/Utils/ValueMapper.cpp index 30fc60081d..e728fd16a3 100644 --- a/lib/Transforms/Utils/ValueMapper.cpp +++ b/lib/Transforms/Utils/ValueMapper.cpp @@ -167,9 +167,10 @@ void llvm::RemapInstruction(Instruction *I, ValueToValueMapTy &VMap, } } - // Remap attached metadata. + // Remap attached metadata. Don't bother remapping DebugLoc, it can never + // have mappings to do. SmallVector<std::pair<unsigned, MDNode *>, 4> MDs; - I->getAllMetadata(MDs); + I->getAllMetadataOtherThanDebugLoc(MDs); for (SmallVectorImpl<std::pair<unsigned, MDNode *> >::iterator MI = MDs.begin(), ME = MDs.end(); MI != ME; ++MI) { MDNode *Old = MI->second; |