From 9a694d933a33df30c41b92ea9d45eb1c07b73c36 Mon Sep 17 00:00:00 2001 From: Jorge Gorbe Moya Date: Mon, 14 Oct 2019 23:25:25 +0000 Subject: [PATCH] Revert "Dead Virtual Function Elimination" This reverts commit 9f6a873268e1ad9855873d9d8007086c0d01cf4f. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@374844 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/LangRef.rst | 9 - docs/TypeMetadata.rst | 64 ------- include/llvm/Analysis/TypeMetadataUtils.h | 2 - include/llvm/IR/FixedMetadataKinds.def | 1 - include/llvm/IR/GlobalObject.h | 16 -- include/llvm/Transforms/IPO/GlobalDCE.h | 14 -- lib/Analysis/TypeMetadataUtils.cpp | 32 ---- lib/IR/Metadata.cpp | 18 -- lib/LTO/LTO.cpp | 2 - lib/LTO/LTOCodeGenerator.cpp | 2 - lib/Transforms/IPO/GlobalDCE.cpp | 156 +----------------- lib/Transforms/IPO/WholeProgramDevirt.cpp | 41 ++++- test/LTO/ARM/lto-linking-metadata.ll | 19 --- test/ThinLTO/X86/lazyload_metadata.ll | 4 +- .../GlobalDCE/virtual-functions-base-call.ll | 78 --------- .../virtual-functions-base-pointer-call.ll | 118 ------------- .../virtual-functions-derived-call.ll | 78 --------- .../virtual-functions-derived-pointer-call.ll | 120 -------------- .../virtual-functions-visibility-post-lto.ll | 95 ----------- .../virtual-functions-visibility-pre-lto.ll | 94 ----------- .../Transforms/GlobalDCE/virtual-functions.ll | 55 ------ test/Transforms/GlobalDCE/vtable-rtti.ll | 47 ------ .../Internalize/vcall-visibility.ll | 64 ------- 23 files changed, 38 insertions(+), 1091 deletions(-) delete mode 100644 test/LTO/ARM/lto-linking-metadata.ll delete mode 100644 test/Transforms/GlobalDCE/virtual-functions-base-call.ll delete mode 100644 test/Transforms/GlobalDCE/virtual-functions-base-pointer-call.ll delete mode 100644 test/Transforms/GlobalDCE/virtual-functions-derived-call.ll delete mode 100644 test/Transforms/GlobalDCE/virtual-functions-derived-pointer-call.ll delete mode 100644 test/Transforms/GlobalDCE/virtual-functions-visibility-post-lto.ll delete mode 100644 test/Transforms/GlobalDCE/virtual-functions-visibility-pre-lto.ll delete mode 100644 test/Transforms/GlobalDCE/virtual-functions.ll delete mode 100644 test/Transforms/GlobalDCE/vtable-rtti.ll delete mode 100644 test/Transforms/Internalize/vcall-visibility.ll diff --git a/docs/LangRef.rst b/docs/LangRef.rst index 2caef042ff2..e797b1f9a15 100644 --- a/docs/LangRef.rst +++ b/docs/LangRef.rst @@ -6264,13 +6264,6 @@ enum is the smallest type which can represent all of its values:: !0 = !{i32 1, !"short_wchar", i32 1} !1 = !{i32 1, !"short_enum", i32 0} -LTO Post-Link Module Flags Metadata ------------------------------------ - -Some optimisations are only when the entire LTO unit is present in the current -module. This is represented by the ``LTOPostLink`` module flags metadata, which -will be created with a value of ``1`` when LTO linking occurs. - Automatic Linker Flags Named Metadata ===================================== @@ -16816,8 +16809,6 @@ Overview: The ``llvm.type.test`` intrinsic tests whether the given pointer is associated with the given type identifier. -.. _type.checked.load: - '``llvm.type.checked.load``' Intrinsic ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/docs/TypeMetadata.rst b/docs/TypeMetadata.rst index 7d0745b9279..84cf05ba70f 100644 --- a/docs/TypeMetadata.rst +++ b/docs/TypeMetadata.rst @@ -224,67 +224,3 @@ efficiently to minimize the sizes of the underlying bitsets. } .. _GlobalLayoutBuilder: https://github.com/llvm/llvm-project/blob/master/llvm/include/llvm/Transforms/IPO/LowerTypeTests.h - -``!vcall_visibility`` Metadata -============================== - -In order to allow removing unused function pointers from vtables, we need to -know whether every virtual call which could use it is known to the compiler, or -whether another translation unit could introduce more calls through the vtable. -This is not the same as the linkage of the vtable, because call sites could be -using a pointer of a more widely-visible base class. For example, consider this -code: - -.. code-block:: c++ - - __attribute__((visibility("default"))) - struct A { - virtual void f(); - }; - - __attribute__((visibility("hidden"))) - struct B : A { - virtual void f(); - }; - -With LTO, we know that all code which can see the declaration of ``B`` is -visible to us. However, a pointer to a ``B`` could be cast to ``A*`` and passed -to another linkage unit, which could then call ``f`` on it. This call would -load from the vtable for ``B`` (using the object pointer), and then call -``B::f``. This means we can't remove the function pointer from ``B``'s vtable, -or the implementation of ``B::f``. However, if we can see all code which knows -about any dynamic base class (which would be the case if ``B`` only inherited -from classes with hidden visibility), then this optimisation would be valid. - -This concept is represented in IR by the ``!vcall_visibility`` metadata -attached to vtable objects, with the following values: - -.. list-table:: - :header-rows: 1 - :widths: 10 90 - - * - Value - - Behavior - - * - 0 (or omitted) - - **Public** - Virtual function calls using this vtable could be made from external - code. - - * - 1 - - **Linkage Unit** - All virtual function calls which might use this vtable are in the - current LTO unit, meaning they will be in the current module once - LTO linking has been performed. - - * - 2 - - **Translation Unit** - All virtual function calls which might use this vtable are in the - current module. - -In addition, all function pointer loads from a vtable marked with the -``!vcall_visibility`` metadata (with a non-zero value) must be done using the -:ref:`llvm.type.checked.load ` intrinsic, so that virtual -calls sites can be correlated with the vtables which they might load from. -Other parts of the vtable (RTTI, offset-to-top, ...) can still be accessed with -normal loads. diff --git a/include/llvm/Analysis/TypeMetadataUtils.h b/include/llvm/Analysis/TypeMetadataUtils.h index 43ce26147c2..82cf8efeea5 100644 --- a/include/llvm/Analysis/TypeMetadataUtils.h +++ b/include/llvm/Analysis/TypeMetadataUtils.h @@ -50,8 +50,6 @@ void findDevirtualizableCallsForTypeCheckedLoad( SmallVectorImpl &LoadedPtrs, SmallVectorImpl &Preds, bool &HasNonCallUses, const CallInst *CI, DominatorTree &DT); - -Constant *getPointerAtOffset(Constant *I, uint64_t Offset, Module &M); } #endif diff --git a/include/llvm/IR/FixedMetadataKinds.def b/include/llvm/IR/FixedMetadataKinds.def index 0e1ffef5867..1ad17093a71 100644 --- a/include/llvm/IR/FixedMetadataKinds.def +++ b/include/llvm/IR/FixedMetadataKinds.def @@ -40,4 +40,3 @@ LLVM_FIXED_MD_KIND(MD_access_group, "llvm.access.group", 25) LLVM_FIXED_MD_KIND(MD_callback, "callback", 26) LLVM_FIXED_MD_KIND(MD_preserve_access_index, "llvm.preserve.access.index", 27) LLVM_FIXED_MD_KIND(MD_misexpect, "misexpect", 28) -LLVM_FIXED_MD_KIND(MD_vcall_visibility, "vcall_visibility", 29) diff --git a/include/llvm/IR/GlobalObject.h b/include/llvm/IR/GlobalObject.h index 6ea2c5d41e7..a47faac5d41 100644 --- a/include/llvm/IR/GlobalObject.h +++ b/include/llvm/IR/GlobalObject.h @@ -28,20 +28,6 @@ class MDNode; class Metadata; class GlobalObject : public GlobalValue { -public: - // VCallVisibility - values for visibility metadata attached to vtables. This - // describes the scope in which a virtual call could end up being dispatched - // through this vtable. - enum VCallVisibility { - // Type is potentially visible to external code. - VCallVisibilityPublic = 0, - // Type is only visible to code which will be in the current Module after - // LTO internalization. - VCallVisibilityLinkageUnit = 1, - // Type is only visible to code in the current Module. - VCallVisibilityTranslationUnit = 2, - }; - protected: GlobalObject(Type *Ty, ValueTy VTy, Use *Ops, unsigned NumOps, LinkageTypes Linkage, const Twine &Name, @@ -177,8 +163,6 @@ public: void copyMetadata(const GlobalObject *Src, unsigned Offset); void addTypeMetadata(unsigned Offset, Metadata *TypeID); - void addVCallVisibilityMetadata(VCallVisibility Visibility); - VCallVisibility getVCallVisibility() const; protected: void copyAttributesFrom(const GlobalObject *Src); diff --git a/include/llvm/Transforms/IPO/GlobalDCE.h b/include/llvm/Transforms/IPO/GlobalDCE.h index 0a6851849e7..c434484d1ae 100644 --- a/include/llvm/Transforms/IPO/GlobalDCE.h +++ b/include/llvm/Transforms/IPO/GlobalDCE.h @@ -43,25 +43,11 @@ private: /// Comdat -> Globals in that Comdat section. std::unordered_multimap ComdatMembers; - /// !type metadata -> set of (vtable, offset) pairs - DenseMap, 4>> - TypeIdMap; - - // Global variables which are vtables, and which we have enough information - // about to safely do dead virtual function elimination. - SmallPtrSet VFESafeVTables; - void UpdateGVDependencies(GlobalValue &GV); void MarkLive(GlobalValue &GV, SmallVectorImpl *Updates = nullptr); bool RemoveUnusedGlobalValue(GlobalValue &GV); - // Dead virtual function elimination. - void AddVirtualFunctionDependencies(Module &M); - void ScanVTables(Module &M); - void ScanTypeCheckedLoadIntrinsics(Module &M); - void ScanVTableLoad(Function *Caller, Metadata *TypeId, uint64_t CallOffset); - void ComputeDependencies(Value *V, SmallPtrSetImpl &U); }; diff --git a/lib/Analysis/TypeMetadataUtils.cpp b/lib/Analysis/TypeMetadataUtils.cpp index 072d291f3f9..9311dfbc6eb 100644 --- a/lib/Analysis/TypeMetadataUtils.cpp +++ b/lib/Analysis/TypeMetadataUtils.cpp @@ -127,35 +127,3 @@ void llvm::findDevirtualizableCallsForTypeCheckedLoad( findCallsAtConstantOffset(DevirtCalls, &HasNonCallUses, LoadedPtr, Offset->getZExtValue(), CI, DT); } - -Constant *llvm::getPointerAtOffset(Constant *I, uint64_t Offset, Module &M) { - if (I->getType()->isPointerTy()) { - if (Offset == 0) - return I; - return nullptr; - } - - const DataLayout &DL = M.getDataLayout(); - - if (auto *C = dyn_cast(I)) { - const StructLayout *SL = DL.getStructLayout(C->getType()); - if (Offset >= SL->getSizeInBytes()) - return nullptr; - - unsigned Op = SL->getElementContainingOffset(Offset); - return getPointerAtOffset(cast(I->getOperand(Op)), - Offset - SL->getElementOffset(Op), M); - } - if (auto *C = dyn_cast(I)) { - ArrayType *VTableTy = C->getType(); - uint64_t ElemSize = DL.getTypeAllocSize(VTableTy->getElementType()); - - unsigned Op = Offset / ElemSize; - if (Op >= C->getNumOperands()) - return nullptr; - - return getPointerAtOffset(cast(I->getOperand(Op)), - Offset % ElemSize, M); - } - return nullptr; -} diff --git a/lib/IR/Metadata.cpp b/lib/IR/Metadata.cpp index 62c2aa86f3b..748a2238e64 100644 --- a/lib/IR/Metadata.cpp +++ b/lib/IR/Metadata.cpp @@ -1497,24 +1497,6 @@ void GlobalObject::addTypeMetadata(unsigned Offset, Metadata *TypeID) { TypeID})); } -void GlobalObject::addVCallVisibilityMetadata(VCallVisibility Visibility) { - addMetadata(LLVMContext::MD_vcall_visibility, - *MDNode::get(getContext(), - {ConstantAsMetadata::get(ConstantInt::get( - Type::getInt64Ty(getContext()), Visibility))})); -} - -GlobalObject::VCallVisibility GlobalObject::getVCallVisibility() const { - if (MDNode *MD = getMetadata(LLVMContext::MD_vcall_visibility)) { - uint64_t Val = cast( - cast(MD->getOperand(0))->getValue()) - ->getZExtValue(); - assert(Val <= 2 && "unknown vcall visibility!"); - return (VCallVisibility)Val; - } - return VCallVisibility::VCallVisibilityPublic; -} - void Function::setSubprogram(DISubprogram *SP) { setMetadata(LLVMContext::MD_dbg, SP); } diff --git a/lib/LTO/LTO.cpp b/lib/LTO/LTO.cpp index c04fc7bacad..6c5858b942a 100644 --- a/lib/LTO/LTO.cpp +++ b/lib/LTO/LTO.cpp @@ -1003,8 +1003,6 @@ Error LTO::runRegularLTO(AddStreamFn AddStream) { GV->setLinkage(GlobalValue::InternalLinkage); } - RegularLTO.CombinedModule->addModuleFlag(Module::Error, "LTOPostLink", 1); - if (Conf.PostInternalizeModuleHook && !Conf.PostInternalizeModuleHook(0, *RegularLTO.CombinedModule)) return Error::success(); diff --git a/lib/LTO/LTOCodeGenerator.cpp b/lib/LTO/LTOCodeGenerator.cpp index 88219289286..4d1d07aec3c 100644 --- a/lib/LTO/LTOCodeGenerator.cpp +++ b/lib/LTO/LTOCodeGenerator.cpp @@ -463,8 +463,6 @@ void LTOCodeGenerator::applyScopeRestrictions() { internalizeModule(*MergedModule, mustPreserveGV); - MergedModule->addModuleFlag(Module::Error, "LTOPostLink", 1); - ScopeRestrictionsDone = true; } diff --git a/lib/Transforms/IPO/GlobalDCE.cpp b/lib/Transforms/IPO/GlobalDCE.cpp index 466d18896ed..86b7f3e49ee 100644 --- a/lib/Transforms/IPO/GlobalDCE.cpp +++ b/lib/Transforms/IPO/GlobalDCE.cpp @@ -17,11 +17,9 @@ #include "llvm/Transforms/IPO/GlobalDCE.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/Statistic.h" -#include "llvm/Analysis/TypeMetadataUtils.h" #include "llvm/IR/Instructions.h" #include "llvm/IR/IntrinsicInst.h" #include "llvm/IR/Module.h" -#include "llvm/IR/Operator.h" #include "llvm/Pass.h" #include "llvm/Transforms/IPO.h" #include "llvm/Transforms/Utils/CtorUtils.h" @@ -31,15 +29,10 @@ using namespace llvm; #define DEBUG_TYPE "globaldce" -static cl::opt - ClEnableVFE("enable-vfe", cl::Hidden, cl::init(true), cl::ZeroOrMore, - cl::desc("Enable virtual function elimination")); - STATISTIC(NumAliases , "Number of global aliases removed"); STATISTIC(NumFunctions, "Number of functions removed"); STATISTIC(NumIFuncs, "Number of indirect functions removed"); STATISTIC(NumVariables, "Number of global variables removed"); -STATISTIC(NumVFuncs, "Number of virtual functions removed"); namespace { class GlobalDCELegacyPass : public ModulePass { @@ -125,15 +118,6 @@ void GlobalDCEPass::UpdateGVDependencies(GlobalValue &GV) { ComputeDependencies(User, Deps); Deps.erase(&GV); // Remove self-reference. for (GlobalValue *GVU : Deps) { - // If this is a dep from a vtable to a virtual function, and we have - // complete information about all virtual call sites which could call - // though this vtable, then skip it, because the call site information will - // be more precise. - if (VFESafeVTables.count(GVU) && isa(&GV)) { - LLVM_DEBUG(dbgs() << "Ignoring dep " << GVU->getName() << " -> " - << GV.getName() << "\n"); - continue; - } GVDependencies[GVU].insert(&GV); } } @@ -148,133 +132,12 @@ void GlobalDCEPass::MarkLive(GlobalValue &GV, if (Updates) Updates->push_back(&GV); if (Comdat *C = GV.getComdat()) { - for (auto &&CM : make_range(ComdatMembers.equal_range(C))) { + for (auto &&CM : make_range(ComdatMembers.equal_range(C))) MarkLive(*CM.second, Updates); // Recursion depth is only two because only // globals in the same comdat are visited. - } - } -} - -void GlobalDCEPass::ScanVTables(Module &M) { - SmallVector Types; - LLVM_DEBUG(dbgs() << "Building type info -> vtable map\n"); - - auto *LTOPostLinkMD = - cast_or_null(M.getModuleFlag("LTOPostLink")); - bool LTOPostLink = - LTOPostLinkMD && - (cast(LTOPostLinkMD->getValue())->getZExtValue() != 0); - - for (GlobalVariable &GV : M.globals()) { - Types.clear(); - GV.getMetadata(LLVMContext::MD_type, Types); - if (GV.isDeclaration() || Types.empty()) - continue; - - // Use the typeid metadata on the vtable to build a mapping from typeids to - // the list of (GV, offset) pairs which are the possible vtables for that - // typeid. - for (MDNode *Type : Types) { - Metadata *TypeID = Type->getOperand(1).get(); - - uint64_t Offset = - cast( - cast(Type->getOperand(0))->getValue()) - ->getZExtValue(); - - TypeIdMap[TypeID].insert(std::make_pair(&GV, Offset)); - } - - // If the type corresponding to the vtable is private to this translation - // unit, we know that we can see all virtual functions which might use it, - // so VFE is safe. - if (auto GO = dyn_cast(&GV)) { - GlobalObject::VCallVisibility TypeVis = GO->getVCallVisibility(); - if (TypeVis == GlobalObject::VCallVisibilityTranslationUnit || - (LTOPostLink && - TypeVis == GlobalObject::VCallVisibilityLinkageUnit)) { - LLVM_DEBUG(dbgs() << GV.getName() << " is safe for VFE\n"); - VFESafeVTables.insert(&GV); - } - } - } -} - -void GlobalDCEPass::ScanVTableLoad(Function *Caller, Metadata *TypeId, - uint64_t CallOffset) { - for (auto &VTableInfo : TypeIdMap[TypeId]) { - GlobalVariable *VTable = VTableInfo.first; - uint64_t VTableOffset = VTableInfo.second; - - Constant *Ptr = - getPointerAtOffset(VTable->getInitializer(), VTableOffset + CallOffset, - *Caller->getParent()); - if (!Ptr) { - LLVM_DEBUG(dbgs() << "can't find pointer in vtable!\n"); - VFESafeVTables.erase(VTable); - return; - } - - auto Callee = dyn_cast(Ptr->stripPointerCasts()); - if (!Callee) { - LLVM_DEBUG(dbgs() << "vtable entry is not function pointer!\n"); - VFESafeVTables.erase(VTable); - return; - } - - LLVM_DEBUG(dbgs() << "vfunc dep " << Caller->getName() << " -> " - << Callee->getName() << "\n"); - GVDependencies[Caller].insert(Callee); } } -void GlobalDCEPass::ScanTypeCheckedLoadIntrinsics(Module &M) { - LLVM_DEBUG(dbgs() << "Scanning type.checked.load intrinsics\n"); - Function *TypeCheckedLoadFunc = - M.getFunction(Intrinsic::getName(Intrinsic::type_checked_load)); - - if (!TypeCheckedLoadFunc) - return; - - for (auto U : TypeCheckedLoadFunc->users()) { - auto CI = dyn_cast(U); - if (!CI) - continue; - - auto *Offset = dyn_cast(CI->getArgOperand(1)); - Value *TypeIdValue = CI->getArgOperand(2); - auto *TypeId = cast(TypeIdValue)->getMetadata(); - - if (Offset) { - ScanVTableLoad(CI->getFunction(), TypeId, Offset->getZExtValue()); - } else { - // type.checked.load with a non-constant offset, so assume every entry in - // every matching vtable is used. - for (auto &VTableInfo : TypeIdMap[TypeId]) { - VFESafeVTables.erase(VTableInfo.first); - } - } - } -} - -void GlobalDCEPass::AddVirtualFunctionDependencies(Module &M) { - if (!ClEnableVFE) - return; - - ScanVTables(M); - - if (VFESafeVTables.empty()) - return; - - ScanTypeCheckedLoadIntrinsics(M); - - LLVM_DEBUG( - dbgs() << "VFE safe vtables:\n"; - for (auto *VTable : VFESafeVTables) - dbgs() << " " << VTable->getName() << "\n"; - ); -} - PreservedAnalyses GlobalDCEPass::run(Module &M, ModuleAnalysisManager &MAM) { bool Changed = false; @@ -300,10 +163,6 @@ PreservedAnalyses GlobalDCEPass::run(Module &M, ModuleAnalysisManager &MAM) { if (Comdat *C = GA.getComdat()) ComdatMembers.insert(std::make_pair(C, &GA)); - // Add dependencies between virtual call sites and the virtual functions they - // might call, if we have that information. - AddVirtualFunctionDependencies(M); - // Loop over the module, adding globals which are obviously necessary. for (GlobalObject &GO : M.global_objects()) { Changed |= RemoveUnusedGlobalValue(GO); @@ -398,17 +257,8 @@ PreservedAnalyses GlobalDCEPass::run(Module &M, ModuleAnalysisManager &MAM) { }; NumFunctions += DeadFunctions.size(); - for (Function *F : DeadFunctions) { - if (!F->use_empty()) { - // Virtual functions might still be referenced by one or more vtables, - // but if we've proven them to be unused then it's safe to replace the - // virtual function pointers with null, allowing us to remove the - // function itself. - ++NumVFuncs; - F->replaceAllUsesWith(ConstantPointerNull::get(F->getType())); - } + for (Function *F : DeadFunctions) EraseUnusedGlobalValue(F); - } NumVariables += DeadGlobalVars.size(); for (GlobalVariable *GV : DeadGlobalVars) @@ -427,8 +277,6 @@ PreservedAnalyses GlobalDCEPass::run(Module &M, ModuleAnalysisManager &MAM) { ConstantDependenciesCache.clear(); GVDependencies.clear(); ComdatMembers.clear(); - TypeIdMap.clear(); - VFESafeVTables.clear(); if (Changed) return PreservedAnalyses::none(); diff --git a/lib/Transforms/IPO/WholeProgramDevirt.cpp b/lib/Transforms/IPO/WholeProgramDevirt.cpp index 52a7dae533b..4055fe04999 100644 --- a/lib/Transforms/IPO/WholeProgramDevirt.cpp +++ b/lib/Transforms/IPO/WholeProgramDevirt.cpp @@ -496,6 +496,7 @@ struct DevirtModule { void buildTypeIdentifierMap( std::vector &Bits, DenseMap> &TypeIdMap); + Constant *getPointerAtOffset(Constant *I, uint64_t Offset); bool tryFindVirtualCallTargets(std::vector &TargetsForSlot, const std::set &TypeMemberInfos, @@ -812,6 +813,38 @@ void DevirtModule::buildTypeIdentifierMap( } } +Constant *DevirtModule::getPointerAtOffset(Constant *I, uint64_t Offset) { + if (I->getType()->isPointerTy()) { + if (Offset == 0) + return I; + return nullptr; + } + + const DataLayout &DL = M.getDataLayout(); + + if (auto *C = dyn_cast(I)) { + const StructLayout *SL = DL.getStructLayout(C->getType()); + if (Offset >= SL->getSizeInBytes()) + return nullptr; + + unsigned Op = SL->getElementContainingOffset(Offset); + return getPointerAtOffset(cast(I->getOperand(Op)), + Offset - SL->getElementOffset(Op)); + } + if (auto *C = dyn_cast(I)) { + ArrayType *VTableTy = C->getType(); + uint64_t ElemSize = DL.getTypeAllocSize(VTableTy->getElementType()); + + unsigned Op = Offset / ElemSize; + if (Op >= C->getNumOperands()) + return nullptr; + + return getPointerAtOffset(cast(I->getOperand(Op)), + Offset % ElemSize); + } + return nullptr; +} + bool DevirtModule::tryFindVirtualCallTargets( std::vector &TargetsForSlot, const std::set &TypeMemberInfos, uint64_t ByteOffset) { @@ -820,7 +853,7 @@ bool DevirtModule::tryFindVirtualCallTargets( return false; Constant *Ptr = getPointerAtOffset(TM.Bits->GV->getInitializer(), - TM.Offset + ByteOffset, M); + TM.Offset + ByteOffset); if (!Ptr) return false; @@ -1908,12 +1941,6 @@ bool DevirtModule::run() { for (VTableBits &B : Bits) rebuildGlobal(B); - // We have lowered or deleted the type checked load intrinsics, so we no - // longer have enough information to reason about the liveness of virtual - // function pointers in GlobalDCE. - for (GlobalVariable &GV : M.globals()) - GV.eraseMetadata(LLVMContext::MD_vcall_visibility); - return true; } diff --git a/test/LTO/ARM/lto-linking-metadata.ll b/test/LTO/ARM/lto-linking-metadata.ll deleted file mode 100644 index ae6f42ff9be..00000000000 --- a/test/LTO/ARM/lto-linking-metadata.ll +++ /dev/null @@ -1,19 +0,0 @@ -; RUN: opt %s -o %t1.bc - -; RUN: llvm-lto %t1.bc -o %t1.save.opt -save-merged-module -O1 --exported-symbol=foo -; RUN: llvm-dis < %t1.save.opt.merged.bc | FileCheck %s - -; RUN: llvm-lto2 run %t1.bc -o %t.out.o -save-temps \ -; RUN: -r=%t1.bc,foo,pxl -; RUN: llvm-dis < %t.out.o.0.2.internalize.bc | FileCheck %s - -target datalayout = "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64" -target triple = "armv7a-unknown-linux" - -define void @foo() { -entry: - ret void -} - -; CHECK: !llvm.module.flags = !{[[MD_NUM:![0-9]+]]} -; CHECK: [[MD_NUM]] = !{i32 1, !"LTOPostLink", i32 1} diff --git a/test/ThinLTO/X86/lazyload_metadata.ll b/test/ThinLTO/X86/lazyload_metadata.ll index 79c377724ef..3b34795b7a1 100644 --- a/test/ThinLTO/X86/lazyload_metadata.ll +++ b/test/ThinLTO/X86/lazyload_metadata.ll @@ -10,13 +10,13 @@ ; RUN: llvm-lto -thinlto-action=import %t2.bc -thinlto-index=%t3.bc \ ; RUN: -o /dev/null -stats \ ; RUN: 2>&1 | FileCheck %s -check-prefix=LAZY -; LAZY: 65 bitcode-reader - Number of Metadata records loaded +; LAZY: 63 bitcode-reader - Number of Metadata records loaded ; LAZY: 2 bitcode-reader - Number of MDStrings loaded ; RUN: llvm-lto -thinlto-action=import %t2.bc -thinlto-index=%t3.bc \ ; RUN: -o /dev/null -disable-ondemand-mds-loading -stats \ ; RUN: 2>&1 | FileCheck %s -check-prefix=NOTLAZY -; NOTLAZY: 74 bitcode-reader - Number of Metadata records loaded +; NOTLAZY: 72 bitcode-reader - Number of Metadata records loaded ; NOTLAZY: 7 bitcode-reader - Number of MDStrings loaded diff --git a/test/Transforms/GlobalDCE/virtual-functions-base-call.ll b/test/Transforms/GlobalDCE/virtual-functions-base-call.ll deleted file mode 100644 index 84d95f607d6..00000000000 --- a/test/Transforms/GlobalDCE/virtual-functions-base-call.ll +++ /dev/null @@ -1,78 +0,0 @@ -; RUN: opt < %s -globaldce -S | FileCheck %s - -target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" - -; struct A { -; A(); -; virtual int foo(); -; }; -; -; struct B : A { -; B(); -; virtual int foo(); -; }; -; -; A::A() {} -; B::B() {} -; int A::foo() { return 42; } -; int B::foo() { return 1337; } -; -; extern "C" int test(A *p) { return p->foo(); } - -; The virtual call in test could be dispatched to either A::foo or B::foo, so -; both must be retained. - -%struct.A = type { i32 (...)** } -%struct.B = type { %struct.A } - -; CHECK: @_ZTV1A = internal unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (i32 (%struct.A*)* @_ZN1A3fooEv to i8*)] } -@_ZTV1A = internal unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (i32 (%struct.A*)* @_ZN1A3fooEv to i8*)] }, align 8, !type !0, !type !1, !vcall_visibility !2 - -; CHECK: @_ZTV1B = internal unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (i32 (%struct.B*)* @_ZN1B3fooEv to i8*)] } -@_ZTV1B = internal unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (i32 (%struct.B*)* @_ZN1B3fooEv to i8*)] }, align 8, !type !0, !type !1, !type !3, !type !4, !vcall_visibility !2 - -; CHECK: define internal i32 @_ZN1A3fooEv( -define internal i32 @_ZN1A3fooEv(%struct.A* nocapture readnone %this) { -entry: - ret i32 42 -} - -; CHECK: define internal i32 @_ZN1B3fooEv( -define internal i32 @_ZN1B3fooEv(%struct.B* nocapture readnone %this) { -entry: - ret i32 1337 -} - -define hidden void @_ZN1AC2Ev(%struct.A* nocapture %this) { -entry: - %0 = getelementptr inbounds %struct.A, %struct.A* %this, i64 0, i32 0 - store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTV1A, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %0, align 8 - ret void -} - -define hidden void @_ZN1BC2Ev(%struct.B* nocapture %this) { -entry: - %0 = getelementptr inbounds %struct.B, %struct.B* %this, i64 0, i32 0, i32 0 - store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTV1B, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %0, align 8 - ret void -} - -define hidden i32 @test(%struct.A* %p) { -entry: - %0 = bitcast %struct.A* %p to i8** - %vtable1 = load i8*, i8** %0, align 8 - %1 = tail call { i8*, i1 } @llvm.type.checked.load(i8* %vtable1, i32 0, metadata !"_ZTS1A"), !nosanitize !10 - %2 = extractvalue { i8*, i1 } %1, 0, !nosanitize !10 - %3 = bitcast i8* %2 to i32 (%struct.A*)*, !nosanitize !10 - %call = tail call i32 %3(%struct.A* %p) - ret i32 %call -} - -declare { i8*, i1 } @llvm.type.checked.load(i8*, i32, metadata) #2 - -!0 = !{i64 16, !"_ZTS1A"} -!1 = !{i64 16, !"_ZTSM1AFivE.virtual"} -!2 = !{i64 2} -!3 = !{i64 16, !"_ZTS1B"} -!4 = !{i64 16, !"_ZTSM1BFivE.virtual"} -!10 = !{} diff --git a/test/Transforms/GlobalDCE/virtual-functions-base-pointer-call.ll b/test/Transforms/GlobalDCE/virtual-functions-base-pointer-call.ll deleted file mode 100644 index d498a336a50..00000000000 --- a/test/Transforms/GlobalDCE/virtual-functions-base-pointer-call.ll +++ /dev/null @@ -1,118 +0,0 @@ -; RUN: opt < %s -globaldce -S | FileCheck %s - -target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" - -; struct A { -; A(); -; virtual int foo(int); -; virtual int bar(float); -; }; -; -; struct B : A { -; B(); -; virtual int foo(int); -; virtual int bar(float); -; }; -; -; A::A() {} -; B::B() {} -; int A::foo(int) { return 1; } -; int A::bar(float) { return 2; } -; int B::foo(int) { return 3; } -; int B::bar(float) { return 4; } -; -; extern "C" int test(A *p, int (A::*q)(int)) { return (p->*q)(42); } - -; Member function pointers are tracked by the combination of their object type -; and function type, which must both be compatible. Here, the call is through a -; pointer of type "int (A::*q)(int)", so the call could be dispatched to A::foo -; or B::foo. It can't be dispatched to A::bar or B::bar as the function pointer -; does not match, so those can be removed. - -%struct.A = type { i32 (...)** } -%struct.B = type { %struct.A } - -; CHECK: @_ZTV1A = internal unnamed_addr constant { [4 x i8*] } { [4 x i8*] [i8* null, i8* null, i8* bitcast (i32 (%struct.A*, i32)* @_ZN1A3fooEi to i8*), i8* null] } -@_ZTV1A = internal unnamed_addr constant { [4 x i8*] } { [4 x i8*] [i8* null, i8* null, i8* bitcast (i32 (%struct.A*, i32)* @_ZN1A3fooEi to i8*), i8* bitcast (i32 (%struct.A*, float)* @_ZN1A3barEf to i8*)] }, align 8, !type !0, !type !1, !type !2, !vcall_visibility !3 -; CHECK: @_ZTV1B = internal unnamed_addr constant { [4 x i8*] } { [4 x i8*] [i8* null, i8* null, i8* bitcast (i32 (%struct.B*, i32)* @_ZN1B3fooEi to i8*), i8* null] } -@_ZTV1B = internal unnamed_addr constant { [4 x i8*] } { [4 x i8*] [i8* null, i8* null, i8* bitcast (i32 (%struct.B*, i32)* @_ZN1B3fooEi to i8*), i8* bitcast (i32 (%struct.B*, float)* @_ZN1B3barEf to i8*)] }, align 8, !type !0, !type !1, !type !2, !type !4, !type !5, !type !6, !vcall_visibility !3 - - -; CHECK: define internal i32 @_ZN1A3fooEi( -define internal i32 @_ZN1A3fooEi(%struct.A* nocapture readnone %this, i32) unnamed_addr #1 align 2 { -entry: - ret i32 1 -} - -; CHECK-NOT: define internal i32 @_ZN1A3barEf( -define internal i32 @_ZN1A3barEf(%struct.A* nocapture readnone %this, float) unnamed_addr #1 align 2 { -entry: - ret i32 2 -} - -; CHECK: define internal i32 @_ZN1B3fooEi( -define internal i32 @_ZN1B3fooEi(%struct.B* nocapture readnone %this, i32) unnamed_addr #1 align 2 { -entry: - ret i32 3 -} - -; CHECK-NOT: define internal i32 @_ZN1B3barEf( -define internal i32 @_ZN1B3barEf(%struct.B* nocapture readnone %this, float) unnamed_addr #1 align 2 { -entry: - ret i32 4 -} - - -define hidden void @_ZN1AC2Ev(%struct.A* nocapture %this) { -entry: - %0 = getelementptr inbounds %struct.A, %struct.A* %this, i64 0, i32 0 - store i32 (...)** bitcast (i8** getelementptr inbounds ({ [4 x i8*] }, { [4 x i8*] }* @_ZTV1A, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %0, align 8 - ret void -} - -define hidden void @_ZN1BC2Ev(%struct.B* nocapture %this) { -entry: - %0 = getelementptr inbounds %struct.B, %struct.B* %this, i64 0, i32 0, i32 0 - store i32 (...)** bitcast (i8** getelementptr inbounds ({ [4 x i8*] }, { [4 x i8*] }* @_ZTV1B, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %0, align 8 - ret void -} - -define hidden i32 @test(%struct.A* %p, i64 %q.coerce0, i64 %q.coerce1) { -entry: - %0 = bitcast %struct.A* %p to i8* - %1 = getelementptr inbounds i8, i8* %0, i64 %q.coerce1 - %this.adjusted = bitcast i8* %1 to %struct.A* - %2 = and i64 %q.coerce0, 1 - %memptr.isvirtual = icmp eq i64 %2, 0 - br i1 %memptr.isvirtual, label %memptr.nonvirtual, label %memptr.virtual - -memptr.virtual: ; preds = %entry - %3 = bitcast i8* %1 to i8** - %vtable = load i8*, i8** %3, align 8 - %4 = add i64 %q.coerce0, -1 - %5 = getelementptr i8, i8* %vtable, i64 %4, !nosanitize !12 - %6 = tail call { i8*, i1 } @llvm.type.checked.load(i8* %5, i32 0, metadata !"_ZTSM1AFiiE.virtual"), !nosanitize !12 - %7 = extractvalue { i8*, i1 } %6, 0, !nosanitize !12 - %memptr.virtualfn = bitcast i8* %7 to i32 (%struct.A*, i32)*, !nosanitize !12 - br label %memptr.end - -memptr.nonvirtual: ; preds = %entry - %memptr.nonvirtualfn = inttoptr i64 %q.coerce0 to i32 (%struct.A*, i32)* - br label %memptr.end - -memptr.end: ; preds = %memptr.nonvirtual, %memptr.virtual - %8 = phi i32 (%struct.A*, i32)* [ %memptr.virtualfn, %memptr.virtual ], [ %memptr.nonvirtualfn, %memptr.nonvirtual ] - %call = tail call i32 %8(%struct.A* %this.adjusted, i32 42) - ret i32 %call -} - -declare { i8*, i1 } @llvm.type.checked.load(i8*, i32, metadata) - -!0 = !{i64 16, !"_ZTS1A"} -!1 = !{i64 16, !"_ZTSM1AFiiE.virtual"} -!2 = !{i64 24, !"_ZTSM1AFifE.virtual"} -!3 = !{i64 2} -!4 = !{i64 16, !"_ZTS1B"} -!5 = !{i64 16, !"_ZTSM1BFiiE.virtual"} -!6 = !{i64 24, !"_ZTSM1BFifE.virtual"} -!12 = !{} diff --git a/test/Transforms/GlobalDCE/virtual-functions-derived-call.ll b/test/Transforms/GlobalDCE/virtual-functions-derived-call.ll deleted file mode 100644 index fb39f649bad..00000000000 --- a/test/Transforms/GlobalDCE/virtual-functions-derived-call.ll +++ /dev/null @@ -1,78 +0,0 @@ -; RUN: opt < %s -globaldce -S | FileCheck %s - -target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" - -; struct A { -; A(); -; virtual int foo(); -; }; -; -; struct B : A { -; B(); -; virtual int foo(); -; }; -; -; A::A() {} -; B::B() {} -; int A::foo() { return 42; } -; int B::foo() { return 1337; } -; -; extern "C" int test(B *p) { return p->foo(); } - -; The virtual call in test can only be dispatched to B::foo (or a more-derived -; class, if there was one), so A::foo can be removed. - -%struct.A = type { i32 (...)** } -%struct.B = type { %struct.A } - -; CHECK: @_ZTV1A = internal unnamed_addr constant { [3 x i8*] } zeroinitializer -@_ZTV1A = internal unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (i32 (%struct.A*)* @_ZN1A3fooEv to i8*)] }, align 8, !type !0, !type !1, !vcall_visibility !2 - -; CHECK: @_ZTV1B = internal unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (i32 (%struct.B*)* @_ZN1B3fooEv to i8*)] } -@_ZTV1B = internal unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (i32 (%struct.B*)* @_ZN1B3fooEv to i8*)] }, align 8, !type !0, !type !1, !type !3, !type !4, !vcall_visibility !2 - -; CHECK-NOT: define internal i32 @_ZN1A3fooEv( -define internal i32 @_ZN1A3fooEv(%struct.A* nocapture readnone %this) { -entry: - ret i32 42 -} - -; CHECK: define internal i32 @_ZN1B3fooEv( -define internal i32 @_ZN1B3fooEv(%struct.B* nocapture readnone %this) { -entry: - ret i32 1337 -} - -define hidden void @_ZN1AC2Ev(%struct.A* nocapture %this) { -entry: - %0 = getelementptr inbounds %struct.A, %struct.A* %this, i64 0, i32 0 - store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTV1A, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %0, align 8 - ret void -} - -define hidden void @_ZN1BC2Ev(%struct.B* nocapture %this) { -entry: - %0 = getelementptr inbounds %struct.B, %struct.B* %this, i64 0, i32 0, i32 0 - store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTV1B, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %0, align 8 - ret void -} - -define hidden i32 @test(%struct.B* %p) { -entry: - %0 = bitcast %struct.B* %p to i8** - %vtable1 = load i8*, i8** %0, align 8 - %1 = tail call { i8*, i1 } @llvm.type.checked.load(i8* %vtable1, i32 0, metadata !"_ZTS1B"), !nosanitize !10 - %2 = extractvalue { i8*, i1 } %1, 0, !nosanitize !10 - %3 = bitcast i8* %2 to i32 (%struct.B*)*, !nosanitize !10 - %call = tail call i32 %3(%struct.B* %p) - ret i32 %call -} - -declare { i8*, i1 } @llvm.type.checked.load(i8*, i32, metadata) #2 - -!0 = !{i64 16, !"_ZTS1A"} -!1 = !{i64 16, !"_ZTSM1AFivE.virtual"} -!2 = !{i64 2} -!3 = !{i64 16, !"_ZTS1B"} -!4 = !{i64 16, !"_ZTSM1BFivE.virtual"} -!10 = !{} diff --git a/test/Transforms/GlobalDCE/virtual-functions-derived-pointer-call.ll b/test/Transforms/GlobalDCE/virtual-functions-derived-pointer-call.ll deleted file mode 100644 index 62b5b8d3730..00000000000 --- a/test/Transforms/GlobalDCE/virtual-functions-derived-pointer-call.ll +++ /dev/null @@ -1,120 +0,0 @@ - -; RUN: opt < %s -globaldce -S | FileCheck %s - -target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" - -; struct A { -; A(); -; virtual int foo(int); -; virtual int bar(float); -; }; -; -; struct B : A { -; B(); -; virtual int foo(int); -; virtual int bar(float); -; }; -; -; A::A() {} -; B::B() {} -; int A::foo(int) { return 1; } -; int A::bar(float) { return 2; } -; int B::foo(int) { return 3; } -; int B::bar(float) { return 4; } -; -; extern "C" int test(B *p, int (B::*q)(int)) { return (p->*q)(42); } - -; Member function pointers are tracked by the combination of their object type -; and function type, which must both be compatible. Here, the call is through a -; pointer of type "int (B::*q)(int)", so the call could only be dispatched to -; B::foo. It can't be dispatched to A::bar or B::bar as the function pointer -; does not match, and it can't be dispatched to A::foo as the object type -; doesn't match, so those can be removed. - -%struct.A = type { i32 (...)** } -%struct.B = type { %struct.A } - -; CHECK: @_ZTV1A = internal unnamed_addr constant { [4 x i8*] } zeroinitializer -@_ZTV1A = internal unnamed_addr constant { [4 x i8*] } { [4 x i8*] [i8* null, i8* null, i8* bitcast (i32 (%struct.A*, i32)* @_ZN1A3fooEi to i8*), i8* bitcast (i32 (%struct.A*, float)* @_ZN1A3barEf to i8*)] }, align 8, !type !0, !type !1, !type !2, !vcall_visibility !3 -; CHECK: @_ZTV1B = internal unnamed_addr constant { [4 x i8*] } { [4 x i8*] [i8* null, i8* null, i8* bitcast (i32 (%struct.B*, i32)* @_ZN1B3fooEi to i8*), i8* null] } -@_ZTV1B = internal unnamed_addr constant { [4 x i8*] } { [4 x i8*] [i8* null, i8* null, i8* bitcast (i32 (%struct.B*, i32)* @_ZN1B3fooEi to i8*), i8* bitcast (i32 (%struct.B*, float)* @_ZN1B3barEf to i8*)] }, align 8, !type !0, !type !1, !type !2, !type !4, !type !5, !type !6, !vcall_visibility !3 - - -; CHECK-NOT: define internal i32 @_ZN1A3fooEi( -define internal i32 @_ZN1A3fooEi(%struct.A* nocapture readnone %this, i32) unnamed_addr #1 align 2 { -entry: - ret i32 1 -} - -; CHECK-NOT: define internal i32 @_ZN1A3barEf( -define internal i32 @_ZN1A3barEf(%struct.A* nocapture readnone %this, float) unnamed_addr #1 align 2 { -entry: - ret i32 2 -} - -; CHECK: define internal i32 @_ZN1B3fooEi( -define internal i32 @_ZN1B3fooEi(%struct.B* nocapture readnone %this, i32) unnamed_addr #1 align 2 { -entry: - ret i32 3 -} - -; CHECK-NOT: define internal i32 @_ZN1B3barEf( -define internal i32 @_ZN1B3barEf(%struct.B* nocapture readnone %this, float) unnamed_addr #1 align 2 { -entry: - ret i32 4 -} - - -define hidden void @_ZN1AC2Ev(%struct.A* nocapture %this) { -entry: - %0 = getelementptr inbounds %struct.A, %struct.A* %this, i64 0, i32 0 - store i32 (...)** bitcast (i8** getelementptr inbounds ({ [4 x i8*] }, { [4 x i8*] }* @_ZTV1A, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %0, align 8 - ret void -} - -define hidden void @_ZN1BC2Ev(%struct.B* nocapture %this) { -entry: - %0 = getelementptr inbounds %struct.B, %struct.B* %this, i64 0, i32 0, i32 0 - store i32 (...)** bitcast (i8** getelementptr inbounds ({ [4 x i8*] }, { [4 x i8*] }* @_ZTV1B, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %0, align 8 - ret void -} - -define hidden i32 @test(%struct.B* %p, i64 %q.coerce0, i64 %q.coerce1) { -entry: - %0 = bitcast %struct.B* %p to i8* - %1 = getelementptr inbounds i8, i8* %0, i64 %q.coerce1 - %this.adjusted = bitcast i8* %1 to %struct.B* - %2 = and i64 %q.coerce0, 1 - %memptr.isvirtual = icmp eq i64 %2, 0 - br i1 %memptr.isvirtual, label %memptr.nonvirtual, label %memptr.virtual - -memptr.virtual: ; preds = %entry - %3 = bitcast i8* %1 to i8** - %vtable = load i8*, i8** %3, align 8 - %4 = add i64 %q.coerce0, -1 - %5 = getelementptr i8, i8* %vtable, i64 %4, !nosanitize !12 - %6 = tail call { i8*, i1 } @llvm.type.checked.load(i8* %5, i32 0, metadata !"_ZTSM1BFiiE.virtual"), !nosanitize !12 - %7 = extractvalue { i8*, i1 } %6, 0, !nosanitize !12 - %memptr.virtualfn = bitcast i8* %7 to i32 (%struct.B*, i32)*, !nosanitize !12 - br label %memptr.end - -memptr.nonvirtual: ; preds = %entry - %memptr.nonvirtualfn = inttoptr i64 %q.coerce0 to i32 (%struct.B*, i32)* - br label %memptr.end - -memptr.end: ; preds = %memptr.nonvirtual, %memptr.virtual - %8 = phi i32 (%struct.B*, i32)* [ %memptr.virtualfn, %memptr.virtual ], [ %memptr.nonvirtualfn, %memptr.nonvirtual ] - %call = tail call i32 %8(%struct.B* %this.adjusted, i32 42) - ret i32 %call -} - -declare { i8*, i1 } @llvm.type.checked.load(i8*, i32, metadata) - -!0 = !{i64 16, !"_ZTS1A"} -!1 = !{i64 16, !"_ZTSM1AFiiE.virtual"} -!2 = !{i64 24, !"_ZTSM1AFifE.virtual"} -!3 = !{i64 2} -!4 = !{i64 16, !"_ZTS1B"} -!5 = !{i64 16, !"_ZTSM1BFiiE.virtual"} -!6 = !{i64 24, !"_ZTSM1BFifE.virtual"} -!12 = !{} diff --git a/test/Transforms/GlobalDCE/virtual-functions-visibility-post-lto.ll b/test/Transforms/GlobalDCE/virtual-functions-visibility-post-lto.ll deleted file mode 100644 index d636b5a3df8..00000000000 --- a/test/Transforms/GlobalDCE/virtual-functions-visibility-post-lto.ll +++ /dev/null @@ -1,95 +0,0 @@ -; RUN: opt < %s -globaldce -S | FileCheck %s - -; structs A, B and C have vcall_visibility of public, linkage-unit and -; translation-unit respectively. This test is run after LTO linking (the -; LTOPostLink metadata is present), so B and C can be VFE'd. - -target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128" - -%struct.A = type { i32 (...)** } - -@_ZTV1A = hidden unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (void (%struct.A*)* @_ZN1A3fooEv to i8*)] }, align 8, !type !0, !type !1, !vcall_visibility !2 - -define internal void @_ZN1AC2Ev(%struct.A* %this) { -entry: - %0 = getelementptr inbounds %struct.A, %struct.A* %this, i64 0, i32 0 - store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTV1A, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %0, align 8 - ret void -} - -; CHECK: define {{.*}} @_ZN1A3fooEv( -define internal void @_ZN1A3fooEv(%struct.A* nocapture %this) { -entry: - ret void -} - -define dso_local i8* @_Z6make_Av() { -entry: - %call = tail call i8* @_Znwm(i64 8) - %0 = bitcast i8* %call to %struct.A* - tail call void @_ZN1AC2Ev(%struct.A* %0) - ret i8* %call -} - - -%struct.B = type { i32 (...)** } - -@_ZTV1B = hidden unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (void (%struct.B*)* @_ZN1B3fooEv to i8*)] }, align 8, !type !0, !type !1, !vcall_visibility !3 - -define internal void @_ZN1BC2Ev(%struct.B* %this) { -entry: - %0 = getelementptr inbounds %struct.B, %struct.B* %this, i64 0, i32 0 - store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTV1B, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %0, align 8 - ret void -} - -; CHECK-NOT: define {{.*}} @_ZN1B3fooEv( -define internal void @_ZN1B3fooEv(%struct.B* nocapture %this) { -entry: - ret void -} - -define dso_local i8* @_Z6make_Bv() { -entry: - %call = tail call i8* @_Znwm(i64 8) - %0 = bitcast i8* %call to %struct.B* - tail call void @_ZN1BC2Ev(%struct.B* %0) - ret i8* %call -} - - -%struct.C = type { i32 (...)** } - -@_ZTV1C = hidden unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (void (%struct.C*)* @_ZN1C3fooEv to i8*)] }, align 8, !type !0, !type !1, !vcall_visibility !4 - -define internal void @_ZN1CC2Ev(%struct.C* %this) { -entry: - %0 = getelementptr inbounds %struct.C, %struct.C* %this, i64 0, i32 0 - store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTV1C, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %0, align 8 - ret void -} - -; CHECK-NOT: define {{.*}} @_ZN1C3fooEv( -define internal void @_ZN1C3fooEv(%struct.C* nocapture %this) { -entry: - ret void -} - -define dso_local i8* @_Z6make_Cv() { -entry: - %call = tail call i8* @_Znwm(i64 8) - %0 = bitcast i8* %call to %struct.C* - tail call void @_ZN1CC2Ev(%struct.C* %0) - ret i8* %call -} - -declare dso_local noalias nonnull i8* @_Znwm(i64) - -!llvm.module.flags = !{!5} - -!0 = !{i64 16, !"_ZTS1A"} -!1 = !{i64 16, !"_ZTSM1AFvvE.virtual"} -!2 = !{i64 0} ; public vcall visibility -!3 = !{i64 1} ; linkage-unit vcall visibility -!4 = !{i64 2} ; translation-unit vcall visibility -!5 = !{i32 1, !"LTOPostLink", i32 1} diff --git a/test/Transforms/GlobalDCE/virtual-functions-visibility-pre-lto.ll b/test/Transforms/GlobalDCE/virtual-functions-visibility-pre-lto.ll deleted file mode 100644 index b0b34c0bbc3..00000000000 --- a/test/Transforms/GlobalDCE/virtual-functions-visibility-pre-lto.ll +++ /dev/null @@ -1,94 +0,0 @@ -; RUN: opt < %s -globaldce -S | FileCheck %s - -; structs A, B and C have vcall_visibility of public, linkage-unit and -; translation-unit respectively. This test is run before LTO linking occurs -; (the LTOPostLink metadata is not present), so only C can be VFE'd. - -target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128" - -%struct.A = type { i32 (...)** } - -@_ZTV1A = hidden unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (void (%struct.A*)* @_ZN1A3fooEv to i8*)] }, align 8, !type !0, !type !1, !vcall_visibility !2 - -define internal void @_ZN1AC2Ev(%struct.A* %this) { -entry: - %0 = getelementptr inbounds %struct.A, %struct.A* %this, i64 0, i32 0 - store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTV1A, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %0, align 8 - ret void -} - -; CHECK: define {{.*}} @_ZN1A3fooEv( -define internal void @_ZN1A3fooEv(%struct.A* nocapture %this) { -entry: - ret void -} - -define dso_local i8* @_Z6make_Av() { -entry: - %call = tail call i8* @_Znwm(i64 8) - %0 = bitcast i8* %call to %struct.A* - tail call void @_ZN1AC2Ev(%struct.A* %0) - ret i8* %call -} - - -%struct.B = type { i32 (...)** } - -@_ZTV1B = hidden unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (void (%struct.B*)* @_ZN1B3fooEv to i8*)] }, align 8, !type !0, !type !1, !vcall_visibility !3 - -define internal void @_ZN1BC2Ev(%struct.B* %this) { -entry: - %0 = getelementptr inbounds %struct.B, %struct.B* %this, i64 0, i32 0 - store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTV1B, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %0, align 8 - ret void -} - -; CHECK: define {{.*}} @_ZN1B3fooEv( -define internal void @_ZN1B3fooEv(%struct.B* nocapture %this) { -entry: - ret void -} - -define dso_local i8* @_Z6make_Bv() { -entry: - %call = tail call i8* @_Znwm(i64 8) - %0 = bitcast i8* %call to %struct.B* - tail call void @_ZN1BC2Ev(%struct.B* %0) - ret i8* %call -} - - -%struct.C = type { i32 (...)** } - -@_ZTV1C = hidden unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (void (%struct.C*)* @_ZN1C3fooEv to i8*)] }, align 8, !type !0, !type !1, !vcall_visibility !4 - -define internal void @_ZN1CC2Ev(%struct.C* %this) { -entry: - %0 = getelementptr inbounds %struct.C, %struct.C* %this, i64 0, i32 0 - store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTV1C, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %0, align 8 - ret void -} - -; CHECK-NOT: define {{.*}} @_ZN1C3fooEv( -define internal void @_ZN1C3fooEv(%struct.C* nocapture %this) { -entry: - ret void -} - -define dso_local i8* @_Z6make_Cv() { -entry: - %call = tail call i8* @_Znwm(i64 8) - %0 = bitcast i8* %call to %struct.C* - tail call void @_ZN1CC2Ev(%struct.C* %0) - ret i8* %call -} - -declare dso_local noalias nonnull i8* @_Znwm(i64) - -!llvm.module.flags = !{} - -!0 = !{i64 16, !"_ZTS1A"} -!1 = !{i64 16, !"_ZTSM1AFvvE.virtual"} -!2 = !{i64 0} ; public vcall visibility -!3 = !{i64 1} ; linkage-unit vcall visibility -!4 = !{i64 2} ; translation-unit vcall visibility diff --git a/test/Transforms/GlobalDCE/virtual-functions.ll b/test/Transforms/GlobalDCE/virtual-functions.ll deleted file mode 100644 index 614907197a8..00000000000 --- a/test/Transforms/GlobalDCE/virtual-functions.ll +++ /dev/null @@ -1,55 +0,0 @@ -; RUN: opt < %s -globaldce -S | FileCheck %s - -target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" - -declare dso_local noalias nonnull i8* @_Znwm(i64) -declare { i8*, i1 } @llvm.type.checked.load(i8*, i32, metadata) - -; %struct.A is a C++ struct with two virtual functions, A::foo and A::bar. The -; !vcall_visibility metadata is set on the vtable, so we know that all virtual -; calls through this vtable are visible and use the @llvm.type.checked.load -; intrinsic. Function test_A makes a call to A::foo, but there is no call to -; A::bar anywhere, so A::bar can be deleted, and its vtable slot replaced with -; null. - -%struct.A = type { i32 (...)** } - -; The pointer to A::bar in the vtable can be removed, because it will never be -; loaded. We replace it with null to keep the layout the same. Because it is at -; the end of the vtable we could potentially shrink the vtable, but don't -; currently do that. -; CHECK: @_ZTV1A = internal unnamed_addr constant { [4 x i8*] } { [4 x i8*] [i8* null, i8* null, i8* bitcast (i32 (%struct.A*)* @_ZN1A3fooEv to i8*), i8* null] } -@_ZTV1A = internal unnamed_addr constant { [4 x i8*] } { [4 x i8*] [i8* null, i8* null, i8* bitcast (i32 (%struct.A*)* @_ZN1A3fooEv to i8*), i8* bitcast (i32 (%struct.A*)* @_ZN1A3barEv to i8*)] }, align 8, !type !0, !type !1, !type !2, !vcall_visibility !3 - -; A::foo is called, so must be retained. -; CHECK: define internal i32 @_ZN1A3fooEv( -define internal i32 @_ZN1A3fooEv(%struct.A* nocapture readnone %this) { -entry: - ret i32 42 -} - -; A::bar is not used, so can be deleted. -; CHECK-NOT: define internal i32 @_ZN1A3barEv( -define internal i32 @_ZN1A3barEv(%struct.A* nocapture readnone %this) { -entry: - ret i32 1337 -} - -define dso_local i32 @test_A() { -entry: - %call = tail call i8* @_Znwm(i64 8) - %0 = bitcast i8* %call to %struct.A* - %1 = bitcast i8* %call to i32 (...)*** - store i32 (...)** bitcast (i8** getelementptr inbounds ({ [4 x i8*] }, { [4 x i8*] }* @_ZTV1A, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %1, align 8 - %2 = tail call { i8*, i1 } @llvm.type.checked.load(i8* bitcast (i8** getelementptr inbounds ({ [4 x i8*] }, { [4 x i8*] }* @_ZTV1A, i64 0, inrange i32 0, i64 2) to i8*), i32 0, metadata !"_ZTS1A"), !nosanitize !9 - %3 = extractvalue { i8*, i1 } %2, 0, !nosanitize !9 - %4 = bitcast i8* %3 to i32 (%struct.A*)*, !nosanitize !9 - %call1 = tail call i32 %4(%struct.A* nonnull %0) - ret i32 %call1 -} - -!0 = !{i64 16, !"_ZTS1A"} -!1 = !{i64 16, !"_ZTSM1AFivE.virtual"} -!2 = !{i64 24, !"_ZTSM1AFivE.virtual"} -!3 = !{i64 2} -!9 = !{} diff --git a/test/Transforms/GlobalDCE/vtable-rtti.ll b/test/Transforms/GlobalDCE/vtable-rtti.ll deleted file mode 100644 index dd611934055..00000000000 --- a/test/Transforms/GlobalDCE/vtable-rtti.ll +++ /dev/null @@ -1,47 +0,0 @@ -; RUN: opt < %s -globaldce -S | FileCheck %s - -; We currently only use llvm.type.checked.load for virtual function pointers, -; not any other part of the vtable, so we can't remove the RTTI pointer even if -; it's never going to be loaded from. - -target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128" - -%struct.A = type { i32 (...)** } - -; CHECK: @_ZTV1A = hidden unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* bitcast ({ i8*, i8* }* @_ZTI1A to i8*), i8* null] }, align 8, !type !0, !type !1, !vcall_visibility !2 - -@_ZTV1A = hidden unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* bitcast ({ i8*, i8* }* @_ZTI1A to i8*), i8* bitcast (void (%struct.A*)* @_ZN1A3fooEv to i8*)] }, align 8, !type !0, !type !1, !vcall_visibility !2 -@_ZTS1A = hidden constant [3 x i8] c"1A\00", align 1 -@_ZTI1A = hidden constant { i8*, i8* } { i8* bitcast (i8** getelementptr inbounds (i8*, i8** @_ZTVN10__cxxabiv117__class_type_infoE, i64 2) to i8*), i8* getelementptr inbounds ([3 x i8], [3 x i8]* @_ZTS1A, i32 0, i32 0) }, align 8 - -define internal void @_ZN1AC2Ev(%struct.A* %this) { -entry: - %0 = getelementptr inbounds %struct.A, %struct.A* %this, i64 0, i32 0 - store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTV1A, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %0, align 8 - ret void -} - -; CHECK-NOT: define {{.*}} @_ZN1A3fooEv( -define internal void @_ZN1A3fooEv(%struct.A* nocapture %this) { -entry: - ret void -} - -define dso_local i8* @_Z6make_Av() { -entry: - %call = tail call i8* @_Znwm(i64 8) - %0 = bitcast i8* %call to %struct.A* - tail call void @_ZN1AC2Ev(%struct.A* %0) - ret i8* %call -} - - -declare dso_local noalias nonnull i8* @_Znwm(i64) -@_ZTVN10__cxxabiv117__class_type_infoE = external dso_local global i8* - -!llvm.module.flags = !{!3} - -!0 = !{i64 16, !"_ZTS1A"} -!1 = !{i64 16, !"_ZTSM1AFvvE.virtual"} -!2 = !{i64 2} ; translation-unit vcall visibility -!3 = !{i32 1, !"LTOPostLink", i32 1} diff --git a/test/Transforms/Internalize/vcall-visibility.ll b/test/Transforms/Internalize/vcall-visibility.ll deleted file mode 100644 index dd4419502a4..00000000000 --- a/test/Transforms/Internalize/vcall-visibility.ll +++ /dev/null @@ -1,64 +0,0 @@ -; RUN: opt < %s -internalize -S | FileCheck %s - -%struct.A = type { i32 (...)** } -%struct.B = type { i32 (...)** } -%struct.C = type { i32 (...)** } - -; Class A has default visibility, so has no !vcall_visibility metadata before -; or after LTO. -; CHECK-NOT: @_ZTV1A = {{.*}}!vcall_visibility -@_ZTV1A = dso_local unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (void (%struct.A*)* @_ZN1A3fooEv to i8*)] }, align 8, !type !0, !type !1 - -; Class B has hidden visibility but public LTO visibility, so has no -; !vcall_visibility metadata before or after LTO. -; CHECK-NOT: @_ZTV1B = {{.*}}!vcall_visibility -@_ZTV1B = hidden unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (void (%struct.B*)* @_ZN1B3fooEv to i8*)] }, align 8, !type !2, !type !3 - -; Class C has hidden visibility, so the !vcall_visibility metadata is set to 1 -; (linkage unit) before LTO, and 2 (translation unit) after LTO. -; CHECK: @_ZTV1C ={{.*}}!vcall_visibility [[MD_TU_VIS:![0-9]+]] -@_ZTV1C = hidden unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* null, i8* bitcast (void (%struct.C*)* @_ZN1C3fooEv to i8*)] }, align 8, !type !4, !type !5, !vcall_visibility !6 - -; Class D has translation unit visibility before LTO, and this is not changed -; by LTO. -; CHECK: @_ZTVN12_GLOBAL__N_11DE = {{.*}}!vcall_visibility [[MD_TU_VIS:![0-9]+]] -@_ZTVN12_GLOBAL__N_11DE = internal unnamed_addr constant { [3 x i8*] } zeroinitializer, align 8, !type !7, !type !9, !vcall_visibility !11 - -define dso_local void @_ZN1A3fooEv(%struct.A* nocapture %this) { -entry: - ret void -} - -define hidden void @_ZN1B3fooEv(%struct.B* nocapture %this) { -entry: - ret void -} - -define hidden void @_ZN1C3fooEv(%struct.C* nocapture %this) { -entry: - ret void -} - -define hidden noalias nonnull i8* @_Z6make_dv() { -entry: - %call = tail call i8* @_Znwm(i64 8) #3 - %0 = bitcast i8* %call to i32 (...)*** - store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTVN12_GLOBAL__N_11DE, i64 0, inrange i32 0, i64 2) to i32 (...)**), i32 (...)*** %0, align 8 - ret i8* %call -} - -declare dso_local noalias nonnull i8* @_Znwm(i64) - -; CHECK: [[MD_TU_VIS]] = !{i64 2} -!0 = !{i64 16, !"_ZTS1A"} -!1 = !{i64 16, !"_ZTSM1AFvvE.virtual"} -!2 = !{i64 16, !"_ZTS1B"} -!3 = !{i64 16, !"_ZTSM1BFvvE.virtual"} -!4 = !{i64 16, !"_ZTS1C"} -!5 = !{i64 16, !"_ZTSM1CFvvE.virtual"} -!6 = !{i64 1} -!7 = !{i64 16, !8} -!8 = distinct !{} -!9 = !{i64 16, !10} -!10 = distinct !{} -!11 = !{i64 2} -- 2.40.0