Revert "Reapply "[IR] Move optional data in llvm::Function into a hungoff uselist""
This reverts commit r256093.
This broke lld-x86_64-win7 because of -Werror,-Wc++1y-extensions.
llvm-svn: 256094
diff --git a/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp b/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp
index faf82a7..2a9b449 100644
--- a/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp
+++ b/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp
@@ -87,9 +87,15 @@
if (!isa<GlobalValue>(A.getAliasee()))
orderValue(A.getAliasee(), OM);
for (const Function &F : M) {
- for (const Use &U : F.operands())
- if (!isa<GlobalValue>(U.get()))
- orderValue(U.get(), OM);
+ if (F.hasPrefixData())
+ if (!isa<GlobalValue>(F.getPrefixData()))
+ orderValue(F.getPrefixData(), OM);
+ if (F.hasPrologueData())
+ if (!isa<GlobalValue>(F.getPrologueData()))
+ orderValue(F.getPrologueData(), OM);
+ if (F.hasPersonalityFn())
+ if (!isa<GlobalValue>(F.getPersonalityFn()))
+ orderValue(F.getPersonalityFn(), OM);
}
OM.LastGlobalConstantID = OM.size();
@@ -267,8 +273,12 @@
for (const GlobalAlias &A : M.aliases())
predictValueUseListOrder(A.getAliasee(), nullptr, OM, Stack);
for (const Function &F : M) {
- for (const Use &U : F.operands())
- predictValueUseListOrder(U.get(), nullptr, OM, Stack);
+ if (F.hasPrefixData())
+ predictValueUseListOrder(F.getPrefixData(), nullptr, OM, Stack);
+ if (F.hasPrologueData())
+ predictValueUseListOrder(F.getPrologueData(), nullptr, OM, Stack);
+ if (F.hasPersonalityFn())
+ predictValueUseListOrder(F.getPersonalityFn(), nullptr, OM, Stack);
}
return Stack;
@@ -311,10 +321,20 @@
for (const GlobalAlias &GA : M.aliases())
EnumerateValue(GA.getAliasee());
- // Enumerate any optional Function data.
+ // Enumerate the prefix data constants.
for (const Function &F : M)
- for (const Use &U : F.operands())
- EnumerateValue(U.get());
+ if (F.hasPrefixData())
+ EnumerateValue(F.getPrefixData());
+
+ // Enumerate the prologue data constants.
+ for (const Function &F : M)
+ if (F.hasPrologueData())
+ EnumerateValue(F.getPrologueData());
+
+ // Enumerate the personality functions.
+ for (Module::const_iterator I = M.begin(), E = M.end(); I != E; ++I)
+ if (I->hasPersonalityFn())
+ EnumerateValue(I->getPersonalityFn());
// Enumerate the metadata type.
//
diff --git a/llvm/lib/IR/AsmWriter.cpp b/llvm/lib/IR/AsmWriter.cpp
index 124fc56..51a0fae 100644
--- a/llvm/lib/IR/AsmWriter.cpp
+++ b/llvm/lib/IR/AsmWriter.cpp
@@ -103,9 +103,17 @@
orderValue(&A, OM);
}
for (const Function &F : *M) {
- for (const Use &U : F.operands())
- if (!isa<GlobalValue>(U.get()))
- orderValue(U.get(), OM);
+ if (F.hasPrefixData())
+ if (!isa<GlobalValue>(F.getPrefixData()))
+ orderValue(F.getPrefixData(), OM);
+
+ if (F.hasPrologueData())
+ if (!isa<GlobalValue>(F.getPrologueData()))
+ orderValue(F.getPrologueData(), OM);
+
+ if (F.hasPersonalityFn())
+ if (!isa<GlobalValue>(F.getPersonalityFn()))
+ orderValue(F.getPersonalityFn(), OM);
orderValue(&F, OM);
@@ -255,8 +263,8 @@
for (const GlobalAlias &A : M->aliases())
predictValueUseListOrder(A.getAliasee(), nullptr, OM, Stack);
for (const Function &F : *M)
- for (const Use &U : F.operands())
- predictValueUseListOrder(U.get(), nullptr, OM, Stack);
+ if (F.hasPrefixData())
+ predictValueUseListOrder(F.getPrefixData(), nullptr, OM, Stack);
return Stack;
}
diff --git a/llvm/lib/IR/Function.cpp b/llvm/lib/IR/Function.cpp
index b6199b8..5e4d2d2 100644
--- a/llvm/lib/IR/Function.cpp
+++ b/llvm/lib/IR/Function.cpp
@@ -279,6 +279,9 @@
// Remove the function from the on-the-side GC table.
clearGC();
+
+ // FIXME: needed by operator delete
+ setFunctionNumOperands(1);
}
void Function::BuildLazyArguments() const {
@@ -325,15 +328,14 @@
while (!BasicBlocks.empty())
BasicBlocks.begin()->eraseFromParent();
- // Drop uses of any optional data (real or placeholder).
- if (getNumOperands()) {
- User::dropAllReferences();
- setNumHungOffUseOperands(0);
- setValueSubclassData(getSubclassDataFromValue() & ~0b1110);
- }
+ // Prefix and prologue data are stored in a side table.
+ setPrefixData(nullptr);
+ setPrologueData(nullptr);
// Metadata is stored in a side-table.
clearMetadata();
+
+ setPersonalityFn(nullptr);
}
void Function::addAttribute(unsigned i, Attribute::AttrKind attr) {
@@ -423,12 +425,18 @@
setGC(SrcF->getGC());
else
clearGC();
- if (SrcF->hasPersonalityFn())
- setPersonalityFn(SrcF->getPersonalityFn());
if (SrcF->hasPrefixData())
setPrefixData(SrcF->getPrefixData());
+ else
+ setPrefixData(nullptr);
if (SrcF->hasPrologueData())
setPrologueData(SrcF->getPrologueData());
+ else
+ setPrologueData(nullptr);
+ if (SrcF->hasPersonalityFn())
+ setPersonalityFn(SrcF->getPersonalityFn());
+ else
+ setPersonalityFn(nullptr);
}
/// \brief This does the actual lookup of an intrinsic ID which
@@ -936,67 +944,61 @@
return false;
}
-Constant *Function::getPersonalityFn() const {
- assert(hasPersonalityFn() && getNumOperands());
- return cast<Constant>(Op<0>());
+static Constant *
+getFunctionData(const Function *F,
+ const LLVMContextImpl::FunctionDataMapTy &Map) {
+ const auto &Entry = Map.find(F);
+ assert(Entry != Map.end());
+ return cast<Constant>(Entry->second->getReturnValue());
}
-void Function::setPersonalityFn(Constant *Fn) {
- if (Fn)
- setHungoffOperand<0>(Fn);
- setValueSubclassDataBit(3, Fn != nullptr);
+/// setFunctionData - Set "Map[F] = Data". Return an updated SubclassData value
+/// in which Bit is low iff Data is null.
+static unsigned setFunctionData(Function *F,
+ LLVMContextImpl::FunctionDataMapTy &Map,
+ Constant *Data, unsigned SCData, unsigned Bit) {
+ ReturnInst *&Holder = Map[F];
+ if (Data) {
+ if (Holder)
+ Holder->setOperand(0, Data);
+ else
+ Holder = ReturnInst::Create(F->getContext(), Data);
+ return SCData | (1 << Bit);
+ } else {
+ delete Holder;
+ Map.erase(F);
+ return SCData & ~(1 << Bit);
+ }
}
Constant *Function::getPrefixData() const {
- assert(hasPrefixData() && getNumOperands());
- return cast<Constant>(Op<1>());
+ assert(hasPrefixData());
+ return getFunctionData(this, getContext().pImpl->PrefixDataMap);
}
void Function::setPrefixData(Constant *PrefixData) {
- if (PrefixData)
- setHungoffOperand<1>(PrefixData);
- setValueSubclassDataBit(1, PrefixData != nullptr);
+ if (!PrefixData && !hasPrefixData())
+ return;
+
+ unsigned SCData = getSubclassDataFromValue();
+ SCData = setFunctionData(this, getContext().pImpl->PrefixDataMap, PrefixData,
+ SCData, /*Bit=*/1);
+ setValueSubclassData(SCData);
}
Constant *Function::getPrologueData() const {
- assert(hasPrologueData() && getNumOperands());
- return cast<Constant>(Op<2>());
+ assert(hasPrologueData());
+ return getFunctionData(this, getContext().pImpl->PrologueDataMap);
}
void Function::setPrologueData(Constant *PrologueData) {
- if (PrologueData)
- setHungoffOperand<2>(PrologueData);
- setValueSubclassDataBit(2, PrologueData != nullptr);
-}
-
-void Function::allocHungoffUselist() {
- // If we've already allocated a uselist, stop here.
- if (getNumOperands())
+ if (!PrologueData && !hasPrologueData())
return;
- allocHungoffUses(3, /*IsPhi=*/ false);
- setNumHungOffUseOperands(3);
-
- // Initialize the uselist with placeholder operands to allow traversal.
- auto *CPN = ConstantPointerNull::get(Type::getInt1PtrTy(getContext(), 0));
- Op<0>().set(CPN);
- Op<1>().set(CPN);
- Op<2>().set(CPN);
-}
-
-template <int Idx>
-void Function::setHungoffOperand(Constant *C) {
- assert(C && "Cannot set hungoff operand to nullptr");
- allocHungoffUselist();
- Op<Idx>().set(C);
-}
-
-void Function::setValueSubclassDataBit(unsigned Bit, bool On) {
- assert(Bit < 16 && "SubclassData contains only 16 bits");
- if (On)
- setValueSubclassData(getSubclassDataFromValue() | (1 << Bit));
- else
- setValueSubclassData(getSubclassDataFromValue() & ~(1 << Bit));
+ unsigned SCData = getSubclassDataFromValue();
+ SCData = setFunctionData(this, getContext().pImpl->PrologueDataMap,
+ PrologueData, SCData, /*Bit=*/2);
+ setValueSubclassData(SCData);
}
void Function::setEntryCount(uint64_t Count) {
@@ -1014,3 +1016,22 @@
}
return None;
}
+
+void Function::setPersonalityFn(Constant *C) {
+ if (!C) {
+ if (hasPersonalityFn()) {
+ // Note, the num operands is used to compute the offset of the operand, so
+ // the order here matters. Clearing the operand then clearing the num
+ // operands ensures we have the correct offset to the operand.
+ Op<0>().set(nullptr);
+ setFunctionNumOperands(0);
+ }
+ } else {
+ // Note, the num operands is used to compute the offset of the operand, so
+ // the order here matters. We need to set num operands to 1 first so that
+ // we get the correct offset to the first operand when we set it.
+ if (!hasPersonalityFn())
+ setFunctionNumOperands(1);
+ Op<0>().set(C);
+ }
+}
diff --git a/llvm/lib/IR/LLVMContextImpl.h b/llvm/lib/IR/LLVMContextImpl.h
index a24114d..ae987e6 100644
--- a/llvm/lib/IR/LLVMContextImpl.h
+++ b/llvm/lib/IR/LLVMContextImpl.h
@@ -1014,6 +1014,17 @@
/// instructions in different blocks at the same location.
DenseMap<std::pair<const char *, unsigned>, unsigned> DiscriminatorTable;
+ typedef DenseMap<const Function *, ReturnInst *> FunctionDataMapTy;
+
+ /// \brief Mapping from a function to its prefix data, which is stored as the
+ /// operand of an unparented ReturnInst so that the prefix data has a Use.
+ FunctionDataMapTy PrefixDataMap;
+
+ /// \brief Mapping from a function to its prologue data, which is stored as
+ /// the operand of an unparented ReturnInst so that the prologue data has a
+ /// Use.
+ FunctionDataMapTy PrologueDataMap;
+
int getOrAddScopeRecordIdxEntry(MDNode *N, int ExistingIdx);
int getOrAddScopeInlinedAtIdxEntry(MDNode *Scope, MDNode *IA,int ExistingIdx);
diff --git a/llvm/lib/IR/TypeFinder.cpp b/llvm/lib/IR/TypeFinder.cpp
index b5bdab0..2ea0550 100644
--- a/llvm/lib/IR/TypeFinder.cpp
+++ b/llvm/lib/IR/TypeFinder.cpp
@@ -44,8 +44,14 @@
for (Module::const_iterator FI = M.begin(), E = M.end(); FI != E; ++FI) {
incorporateType(FI->getType());
- for (const Use &U : FI->operands())
- incorporateValue(U.get());
+ if (FI->hasPrefixData())
+ incorporateValue(FI->getPrefixData());
+
+ if (FI->hasPrologueData())
+ incorporateValue(FI->getPrologueData());
+
+ if (FI->hasPersonalityFn())
+ incorporateValue(FI->getPersonalityFn());
// First incorporate the arguments.
for (Function::const_arg_iterator AI = FI->arg_begin(),
diff --git a/llvm/lib/Transforms/IPO/GlobalDCE.cpp b/llvm/lib/Transforms/IPO/GlobalDCE.cpp
index 9b276ed..1cc6574 100644
--- a/llvm/lib/Transforms/IPO/GlobalDCE.cpp
+++ b/llvm/lib/Transforms/IPO/GlobalDCE.cpp
@@ -215,8 +215,14 @@
// any globals used will be marked as needed.
Function *F = cast<Function>(G);
- for (Use &U : F->operands())
- MarkUsedGlobalsAsNeeded(cast<Constant>(U.get()));
+ if (F->hasPrefixData())
+ MarkUsedGlobalsAsNeeded(F->getPrefixData());
+
+ if (F->hasPrologueData())
+ MarkUsedGlobalsAsNeeded(F->getPrologueData());
+
+ if (F->hasPersonalityFn())
+ MarkUsedGlobalsAsNeeded(F->getPersonalityFn());
for (BasicBlock &BB : *F)
for (Instruction &I : BB)