Index: llvm/trunk/include/llvm/IR/AutoUpgrade.h =================================================================== --- llvm/trunk/include/llvm/IR/AutoUpgrade.h +++ llvm/trunk/include/llvm/IR/AutoUpgrade.h @@ -51,9 +51,10 @@ /// module is modified. bool UpgradeModuleFlags(Module &M); - /// If the TBAA tag for the given instruction uses the scalar TBAA format, - /// we upgrade it to the struct-path aware TBAA format. - void UpgradeInstWithTBAATag(Instruction *I); + /// If the given TBAA tag uses the scalar TBAA format, create a new node + /// corresponding to the upgrade to the struct-path aware TBAA format. + /// Otherwise return the \p TBAANode itself. + MDNode *UpgradeTBAANode(MDNode &TBAANode); /// This is an auto-upgrade for bitcast between pointers with different /// address spaces: the instruction is replaced by a pair ptrtoint+inttoptr. Index: llvm/trunk/lib/AsmParser/LLParser.cpp =================================================================== --- llvm/trunk/lib/AsmParser/LLParser.cpp +++ llvm/trunk/lib/AsmParser/LLParser.cpp @@ -222,8 +222,13 @@ N.second->resolveCycles(); } - for (unsigned I = 0, E = InstsWithTBAATag.size(); I < E; I++) - UpgradeInstWithTBAATag(InstsWithTBAATag[I]); + for (auto *Inst : InstsWithTBAATag) { + MDNode *MD = Inst->getMetadata(LLVMContext::MD_tbaa); + assert(MD && "UpgradeInstWithTBAATag should have a TBAA tag"); + auto *UpgradedMD = UpgradeTBAANode(*MD); + if (MD != UpgradedMD) + Inst->setMetadata(LLVMContext::MD_tbaa, UpgradedMD); + } // Look for intrinsic functions and CallInst that need to be upgraded for (Module::iterator FI = M->begin(), FE = M->end(); FI != FE; ) Index: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp =================================================================== --- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp +++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp @@ -257,8 +257,6 @@ std::vector > FunctionPrologues; std::vector > FunctionPersonalityFns; - SmallVector InstsWithTBAATag; - bool HasSeenOldLoopTags = false; /// The set of attributes by index. Index zero in the file is for null, and @@ -4425,11 +4423,11 @@ if (HasSeenOldLoopTags && I->second == LLVMContext::MD_loop) MD = upgradeInstructionLoopAttachment(*MD); - Inst->setMetadata(I->second, MD); if (I->second == LLVMContext::MD_tbaa) { - InstsWithTBAATag.push_back(Inst); - continue; + assert(!MD->isTemporary() && "should load MDs before attachments"); + MD = UpgradeTBAANode(*MD); } + Inst->setMetadata(I->second, MD); } break; } @@ -5842,11 +5840,6 @@ if (!BasicBlockFwdRefs.empty()) return error("Never resolved function from blockaddress"); - // Upgrading intrinsic calls before TBAA can cause TBAA metadata to be lost, - // to prevent this instructions with TBAA tags should be upgraded first. - for (unsigned I = 0, E = InstsWithTBAATag.size(); I < E; I++) - UpgradeInstWithTBAATag(InstsWithTBAATag[I]); - // Upgrade any intrinsic calls that slipped through (should not happen!) and // delete the old functions to clean up. We can't do this unless the entire // module is materialized because there could always be another function body Index: llvm/trunk/lib/IR/AutoUpgrade.cpp =================================================================== --- llvm/trunk/lib/IR/AutoUpgrade.cpp +++ llvm/trunk/lib/IR/AutoUpgrade.cpp @@ -1488,28 +1488,26 @@ } } -void llvm::UpgradeInstWithTBAATag(Instruction *I) { - MDNode *MD = I->getMetadata(LLVMContext::MD_tbaa); - assert(MD && "UpgradeInstWithTBAATag should have a TBAA tag"); +MDNode *llvm::UpgradeTBAANode(MDNode &MD) { // Check if the tag uses struct-path aware TBAA format. - if (isa(MD->getOperand(0)) && MD->getNumOperands() >= 3) - return; + if (isa(MD.getOperand(0)) && MD.getNumOperands() >= 3) + return &MD; - if (MD->getNumOperands() == 3) { - Metadata *Elts[] = {MD->getOperand(0), MD->getOperand(1)}; - MDNode *ScalarType = MDNode::get(I->getContext(), Elts); + auto &Context = MD.getContext(); + if (MD.getNumOperands() == 3) { + Metadata *Elts[] = {MD.getOperand(0), MD.getOperand(1)}; + MDNode *ScalarType = MDNode::get(Context, Elts); // Create a MDNode Metadata *Elts2[] = {ScalarType, ScalarType, - ConstantAsMetadata::get(Constant::getNullValue( - Type::getInt64Ty(I->getContext()))), - MD->getOperand(2)}; - I->setMetadata(LLVMContext::MD_tbaa, MDNode::get(I->getContext(), Elts2)); - } else { - // Create a MDNode - Metadata *Elts[] = {MD, MD, ConstantAsMetadata::get(Constant::getNullValue( - Type::getInt64Ty(I->getContext())))}; - I->setMetadata(LLVMContext::MD_tbaa, MDNode::get(I->getContext(), Elts)); - } + ConstantAsMetadata::get( + Constant::getNullValue(Type::getInt64Ty(Context))), + MD.getOperand(2)}; + return MDNode::get(Context, Elts2); + } + // Create a MDNode + Metadata *Elts[] = {&MD, &MD, ConstantAsMetadata::get(Constant::getNullValue( + Type::getInt64Ty(Context)))}; + return MDNode::get(Context, Elts); } Instruction *llvm::UpgradeBitCastInst(unsigned Opc, Value *V, Type *DestTy, Index: llvm/trunk/test/LTO/X86/Inputs/remangle_intrinsics_tbaa.ll =================================================================== --- llvm/trunk/test/LTO/X86/Inputs/remangle_intrinsics_tbaa.ll +++ llvm/trunk/test/LTO/X86/Inputs/remangle_intrinsics_tbaa.ll @@ -0,0 +1,8 @@ +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-apple-macosx10.11.0" + +%some_named_struct = type { i8, i8 } + +define void @bar(%some_named_struct*) { + ret void +} Index: llvm/trunk/test/LTO/X86/remangle_intrinsics_tbaa.ll =================================================================== --- llvm/trunk/test/LTO/X86/remangle_intrinsics_tbaa.ll +++ llvm/trunk/test/LTO/X86/remangle_intrinsics_tbaa.ll @@ -0,0 +1,23 @@ +; RUN: llvm-as %s -o %t1.bc +; RUN: llvm-as %p/Inputs/remangle_intrinsics_tbaa.ll -o %t2.bc +; RUN: llvm-link -disable-lazy-loading %t2.bc %t1.bc -S | FileCheck %s + +; Verify that we correctly rename the intrinsic and don't crash +; CHECK: @llvm.masked.store.v4p0some_named_struct.0.p0v4p0some_named_struct.0 + +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-apple-macosx10.11.0" + +%some_named_struct = type { i8 } + +define void @foo(%some_named_struct*) { + call void @llvm.masked.store.v4p0some_named_struct.p0v4p0some_named_struct(<4 x %some_named_struct*> undef, <4 x %some_named_struct*>* undef, i32 8, <4 x i1> undef), !tbaa !5 + ret void +} + +declare void @llvm.masked.store.v4p0some_named_struct.p0v4p0some_named_struct(<4 x %some_named_struct*>, <4 x %some_named_struct*>*, i32, <4 x i1>) #1 + +!5 = !{!6, !6, i64 0} +!6 = !{!"any pointer", !7, i64 0} +!7 = !{!"omnipotent char", !8, i64 0} +!8 = !{!"Simple C/C++ TBAA"} Index: llvm/trunk/tools/llvm-link/llvm-link.cpp =================================================================== --- llvm/trunk/tools/llvm-link/llvm-link.cpp +++ llvm/trunk/tools/llvm-link/llvm-link.cpp @@ -82,8 +82,11 @@ Force("f", cl::desc("Enable binary output on terminals")); static cl::opt -OutputAssembly("S", - cl::desc("Write output as LLVM assembly"), cl::Hidden); + DisableLazyLoad("disable-lazy-loading", + cl::desc("Enable binary output on terminals")); + +static cl::opt + OutputAssembly("S", cl::desc("Write output as LLVM assembly"), cl::Hidden); static cl::opt Verbose("v", cl::desc("Print information about actions taken")); @@ -114,8 +117,12 @@ bool MaterializeMetadata = true) { SMDiagnostic Err; if (Verbose) errs() << "Loading '" << FN << "'\n"; - std::unique_ptr Result = - getLazyIRFileModule(FN, Err, Context, !MaterializeMetadata); + std::unique_ptr Result; + if (DisableLazyLoad) + Result = parseIRFile(FN, Err, Context); + else + Result = getLazyIRFileModule(FN, Err, Context, !MaterializeMetadata); + if (!Result) { Err.print(argv0, errs()); return nullptr;