There is no need for BytecodeParser to be an AbstractTypeUser. Instead, it
can just use PATypeHolders
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8832 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Bytecode/Reader/ConstantReader.cpp b/lib/Bytecode/Reader/ConstantReader.cpp
index 91baa56..43acde1 100644
--- a/lib/Bytecode/Reader/ConstantReader.cpp
+++ b/lib/Bytecode/Reader/ConstantReader.cpp
@@ -94,25 +94,6 @@
}
}
-// refineAbstractType - The callback method is invoked when one of the
-// elements of TypeValues becomes more concrete...
-//
-void BytecodeParser::refineAbstractType(const DerivedType *OldType,
- const Type *NewType) {
- TypeValuesListTy::iterator I = find(FunctionTypeValues.begin(),
- FunctionTypeValues.end(), OldType);
- if (I == FunctionTypeValues.end()) {
- I = find(ModuleTypeValues.begin(), ModuleTypeValues.end(), OldType);
- assert(I != ModuleTypeValues.end() &&
- "Can't refine a type I don't know about!");
- }
-
- I->removeUserFromConcrete();
- *I = NewType; // Update to point to new, more refined type.
-}
-
-
-
// parseTypeConstants - We have to use this weird code to handle recursive
// types. We know that recursive types will only reference the current slab of
// values in the type plane, but they can forward reference types before they
@@ -132,7 +113,7 @@
// Insert a bunch of opaque types to be resolved later...
for (unsigned i = 0; i < NumEntries; ++i)
- Tab.push_back(PATypeHandle(OpaqueType::get(), this));
+ Tab.push_back(OpaqueType::get());
// Loop through reading all of the types. Forward types will make use of the
// opaque types just inserted.
diff --git a/lib/Bytecode/Reader/ReaderInternals.h b/lib/Bytecode/Reader/ReaderInternals.h
index e715405..f7113c0 100644
--- a/lib/Bytecode/Reader/ReaderInternals.h
+++ b/lib/Bytecode/Reader/ReaderInternals.h
@@ -43,7 +43,7 @@
unsigned FunctionSlot;
};
-class BytecodeParser : public AbstractTypeUser, public AbstractModuleProvider {
+class BytecodeParser : public AbstractModuleProvider {
BytecodeParser(const BytecodeParser &); // DO NOT IMPLEMENT
void operator=(const BytecodeParser &); // DO NOT IMPLEMENT
public:
@@ -116,7 +116,7 @@
// TypesLoaded - This vector mirrors the Values[TypeTyID] plane. It is used
// to deal with forward references to types.
//
- typedef std::vector<PATypeHandle> TypeValuesListTy;
+ typedef std::vector<PATypeHolder> TypeValuesListTy;
TypeValuesListTy ModuleTypeValues;
TypeValuesListTy FunctionTypeValues;
@@ -189,12 +189,6 @@
// resolve all references to the placeholder (if any) for the given value
void ResolveReferencesToValue(Value *Val, unsigned Slot);
-
-
- // refineAbstractType - The callback method is invoked when one of the
- // elements of TypeValues becomes more concrete...
- //
- virtual void refineAbstractType(const DerivedType *OldTy, const Type *NewTy);
};
template<class SuperType>