From 8b4cf5e8a25d9995a9d17b2b888f9d1658fa3048 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 15 Jul 2011 23:18:40 +0000 Subject: fix rdar://9776316 - type remapping needed for inline asm blobs, fixing some objc llvm-test crashes with LTO. llvm-svn: 135324 --- llvm/lib/Transforms/Utils/ValueMapper.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'llvm/lib/Transforms') diff --git a/llvm/lib/Transforms/Utils/ValueMapper.cpp b/llvm/lib/Transforms/Utils/ValueMapper.cpp index e728fd16a30..973b105a1cb 100644 --- a/llvm/lib/Transforms/Utils/ValueMapper.cpp +++ b/llvm/lib/Transforms/Utils/ValueMapper.cpp @@ -15,6 +15,7 @@ #include "llvm/Transforms/Utils/ValueMapper.h" #include "llvm/Constants.h" #include "llvm/Function.h" +#include "llvm/InlineAsm.h" #include "llvm/Instructions.h" #include "llvm/Metadata.h" using namespace llvm; @@ -31,8 +32,23 @@ Value *llvm::MapValue(const Value *V, ValueToValueMapTy &VM, RemapFlags Flags, // Global values do not need to be seeded into the VM if they // are using the identity mapping. - if (isa(V) || isa(V) || isa(V)) + if (isa(V) || isa(V)) return VM[V] = const_cast(V); + + if (const InlineAsm *IA = dyn_cast(V)) { + // Inline asm may need *type* remapping. + FunctionType *NewTy = IA->getFunctionType(); + if (TypeMapper) { + NewTy = cast(TypeMapper->remapType(NewTy)); + + if (NewTy != IA->getFunctionType()) + V = InlineAsm::get(NewTy, IA->getAsmString(), IA->getConstraintString(), + IA->hasSideEffects(), IA->isAlignStack()); + } + + return VM[V] = const_cast(V); + } + if (const MDNode *MD = dyn_cast(V)) { // If this is a module-level metadata and we know that nothing at the module -- cgit v1.2.3