Use separate ValueList for metadata.
This fixes PR4666.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78056 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Bitcode/Writer/BitcodeWriter.cpp b/lib/Bitcode/Writer/BitcodeWriter.cpp
index 6bd40ba..a5c28fc 100644
--- a/lib/Bitcode/Writer/BitcodeWriter.cpp
+++ b/lib/Bitcode/Writer/BitcodeWriter.cpp
@@ -492,7 +492,7 @@
static void WriteModuleMetadata(const ValueEnumerator &VE,
BitstreamWriter &Stream) {
- const ValueEnumerator::ValueList &Vals = VE.getValues();
+ const ValueEnumerator::ValueList &Vals = VE.getMDValues();
bool StartedMetadataBlock = false;
unsigned MDSAbbrev = 0;
SmallVector<uint64_t, 64> Record;
@@ -601,8 +601,6 @@
const Type *LastTy = 0;
for (unsigned i = FirstVal; i != LastVal; ++i) {
const Value *V = Vals[i].first;
- if (isa<MetadataBase>(V))
- continue;
// If we need to switch types, do so now.
if (V->getType() != LastTy) {
LastTy = V->getType();
diff --git a/lib/Bitcode/Writer/ValueEnumerator.cpp b/lib/Bitcode/Writer/ValueEnumerator.cpp
index 7583bb9..4712dea 100644
--- a/lib/Bitcode/Writer/ValueEnumerator.cpp
+++ b/lib/Bitcode/Writer/ValueEnumerator.cpp
@@ -114,6 +114,18 @@
TypeMap[Types[i].first] = i+1;
}
+unsigned ValueEnumerator::getValueID(const Value *V) const {
+ if (isa<MetadataBase>(V)) {
+ ValueMapType::const_iterator I = MDValueMap.find(V);
+ assert(I != MDValueMap.end() && "Value not in slotcalculator!");
+ return I->second-1;
+ }
+
+ ValueMapType::const_iterator I = ValueMap.find(V);
+ assert(I != ValueMap.end() && "Value not in slotcalculator!");
+ return I->second-1;
+}
+
// Optimize constant ordering.
namespace {
struct CstSortPredicate {
@@ -165,9 +177,51 @@
EnumerateValue(VI->getValue());
}
+void ValueEnumerator::EnumerateMetadata(const MetadataBase *MD) {
+ // Check to see if it's already in!
+ unsigned &MDValueID = MDValueMap[MD];
+ if (MDValueID) {
+ // Increment use count.
+ MDValues[MDValueID-1].second++;
+ return;
+ }
+
+ // Enumerate the type of this value.
+ EnumerateType(MD->getType());
+
+ if (const MDNode *N = dyn_cast<MDNode>(MD)) {
+ MDValues.push_back(std::make_pair(MD, 1U));
+ MDValueMap[MD] = MDValues.size();
+ MDValueID = MDValues.size();
+ for (MDNode::const_elem_iterator I = N->elem_begin(), E = N->elem_end();
+ I != E; ++I) {
+ if (*I)
+ EnumerateValue(*I);
+ else
+ EnumerateType(Type::VoidTy);
+ }
+ return;
+ } else if (const NamedMDNode *N = dyn_cast<NamedMDNode>(MD)) {
+ for(NamedMDNode::const_elem_iterator I = N->elem_begin(),
+ E = N->elem_end(); I != E; ++I) {
+ MetadataBase *M = *I;
+ EnumerateValue(M);
+ }
+ MDValues.push_back(std::make_pair(MD, 1U));
+ MDValueMap[MD] = Values.size();
+ return;
+ }
+
+ // Add the value.
+ MDValues.push_back(std::make_pair(MD, 1U));
+ MDValueID = MDValues.size();
+}
+
void ValueEnumerator::EnumerateValue(const Value *V) {
assert(V->getType() != Type::VoidTy && "Can't insert void values!");
-
+ if (const MetadataBase *MB = dyn_cast<MetadataBase>(V))
+ return EnumerateMetadata(MB);
+
// Check to see if it's already in!
unsigned &ValueID = ValueMap[V];
if (ValueID) {
@@ -207,31 +261,6 @@
}
}
- if (const MDNode *N = dyn_cast<MDNode>(V)) {
- Values.push_back(std::make_pair(V, 1U));
- ValueMap[V] = Values.size();
- ValueID = Values.size();
- for (MDNode::const_elem_iterator I = N->elem_begin(), E = N->elem_end();
- I != E; ++I) {
- if (*I)
- EnumerateValue(*I);
- else
- EnumerateType(Type::VoidTy);
- }
- return;
- }
-
- if (const NamedMDNode *N = dyn_cast<NamedMDNode>(V)) {
- for(NamedMDNode::const_elem_iterator I = N->elem_begin(),
- E = N->elem_end(); I != E; ++I) {
- MetadataBase *M = *I;
- EnumerateValue(M);
- }
- Values.push_back(std::make_pair(V, 1U));
- ValueMap[V] = Values.size();
- return;
- }
-
// Add the value.
Values.push_back(std::make_pair(V, 1U));
ValueID = Values.size();
diff --git a/lib/Bitcode/Writer/ValueEnumerator.h b/lib/Bitcode/Writer/ValueEnumerator.h
index 40eeabb..b5106f0 100644
--- a/lib/Bitcode/Writer/ValueEnumerator.h
+++ b/lib/Bitcode/Writer/ValueEnumerator.h
@@ -25,6 +25,7 @@
class BasicBlock;
class Function;
class Module;
+class MetadataBase;
class AttrListPtr;
class TypeSymbolTable;
class ValueSymbolTable;
@@ -44,7 +45,9 @@
typedef DenseMap<const Value*, unsigned> ValueMapType;
ValueMapType ValueMap;
ValueList Values;
-
+ ValueList MDValues;
+ ValueMapType MDValueMap;
+
typedef DenseMap<void*, unsigned> AttributeMapType;
AttributeMapType AttributeMap;
std::vector<AttrListPtr> Attributes;
@@ -64,12 +67,8 @@
public:
ValueEnumerator(const Module *M);
- unsigned getValueID(const Value *V) const {
- ValueMapType::const_iterator I = ValueMap.find(V);
- assert(I != ValueMap.end() && "Value not in slotcalculator!");
- return I->second-1;
- }
-
+ unsigned getValueID(const Value *V) const;
+
unsigned getTypeID(const Type *T) const {
TypeMapType::const_iterator I = TypeMap.find(T);
assert(I != TypeMap.end() && "Type not in ValueEnumerator!");
@@ -91,6 +90,7 @@
}
const ValueList &getValues() const { return Values; }
+ const ValueList &getMDValues() const { return MDValues; }
const TypeList &getTypes() const { return Types; }
const std::vector<const BasicBlock*> &getBasicBlocks() const {
return BasicBlocks;
@@ -108,6 +108,7 @@
private:
void OptimizeConstants(unsigned CstStart, unsigned CstEnd);
+ void EnumerateMetadata(const MetadataBase *MD);
void EnumerateValue(const Value *V);
void EnumerateType(const Type *T);
void EnumerateOperandType(const Value *V);