#define BITCODE_READER_H
#include "llvm/ModuleProvider.h"
-#include "llvm/ParameterAttributes.h"
+#include "llvm/Attributes.h"
#include "llvm/Type.h"
#include "llvm/OperandTraits.h"
#include "llvm/Bitcode/BitstreamReader.h"
#include "llvm/Bitcode/LLVMBitCodes.h"
+#include "llvm/Support/ValueHandle.h"
#include "llvm/ADT/DenseMap.h"
#include <vector>
namespace llvm {
class MemoryBuffer;
+ class LLVMContext;
//===----------------------------------------------------------------------===//
// BitcodeReaderValueList Class
//===----------------------------------------------------------------------===//
-class BitcodeReaderValueList : public User {
- unsigned Capacity;
+class BitcodeReaderValueList {
+ std::vector<WeakVH> ValuePtrs;
+
+ /// ResolveConstants - As we resolve forward-referenced constants, we add
+ /// information about them to this vector. This allows us to resolve them in
+ /// bulk instead of resolving each reference at a time. See the code in
+ /// ResolveConstantForwardRefs for more information about this.
+ ///
+ /// The key of this vector is the placeholder constant, the value is the slot
+ /// number that holds the resolved value.
+ typedef std::vector<std::pair<Constant*, unsigned> > ResolveConstantsTy;
+ ResolveConstantsTy ResolveConstants;
public:
- BitcodeReaderValueList() : User(Type::VoidTy, Value::ArgumentVal, 0, 0)
- , Capacity(0) {}
-
- /// Provide fast operand accessors
- DECLARE_TRANSPARENT_OPERAND_ACCESSORS(Value);
+ BitcodeReaderValueList() {}
+ ~BitcodeReaderValueList() {
+ assert(ResolveConstants.empty() && "Constants not resolved?");
+ }
// vector compatibility methods
- unsigned size() const { return getNumOperands(); }
- void resize(unsigned);
+ unsigned size() const { return ValuePtrs.size(); }
+ void resize(unsigned N) { ValuePtrs.resize(N); }
void push_back(Value *V) {
- unsigned OldOps(NumOperands), NewOps(NumOperands + 1);
- resize(NewOps);
- NumOperands = NewOps;
- OperandList[OldOps] = V;
+ ValuePtrs.push_back(V);
}
void clear() {
- if (OperandList) dropHungoffUses(OperandList);
- Capacity = 0;
+ assert(ResolveConstants.empty() && "Constants not resolved?");
+ ValuePtrs.clear();
}
- Value *operator[](unsigned i) const { return getOperand(i); }
+ Value *operator[](unsigned i) const {
+ assert(i < ValuePtrs.size());
+ return ValuePtrs[i];
+ }
- Value *back() const { return getOperand(size() - 1); }
- void pop_back() { setOperand(size() - 1, 0); --NumOperands; }
- bool empty() const { return NumOperands == 0; }
+ Value *back() const { return ValuePtrs.back(); }
+ void pop_back() { ValuePtrs.pop_back(); }
+ bool empty() const { return ValuePtrs.empty(); }
void shrinkTo(unsigned N) {
- assert(N <= NumOperands && "Invalid shrinkTo request!");
- while (NumOperands > N)
- pop_back();
+ assert(N <= size() && "Invalid shrinkTo request!");
+ ValuePtrs.resize(N);
}
- virtual void print(std::ostream&) const {}
Constant *getConstantFwdRef(unsigned Idx, const Type *Ty);
Value *getValueFwdRef(unsigned Idx, const Type *Ty);
- void AssignValue(Value *V, unsigned Idx) {
- if (Idx == size()) {
- push_back(V);
- } else if (Value *OldV = getOperand(Idx)) {
- // If there was a forward reference to this value, replace it.
- setOperand(Idx, V);
- OldV->replaceAllUsesWith(V);
- delete OldV;
- } else {
- initVal(Idx, V);
- }
- }
+ void AssignValue(Value *V, unsigned Idx);
-private:
- void initVal(unsigned Idx, Value *V) {
- if (Idx >= size()) {
- // Insert a bunch of null values.
- resize(Idx * 2 + 1);
- }
- assert(getOperand(Idx) == 0 && "Cannot init an already init'd Use!");
- OperandList[Idx] = V;
- }
+ /// ResolveConstantForwardRefs - Once all constants are read, this method bulk
+ /// resolves any forward references.
+ void ResolveConstantForwardRefs();
};
-template <>
-struct OperandTraits<BitcodeReaderValueList> : HungoffOperandTraits</*16 FIXME*/> {
-};
-
-DEFINE_TRANSPARENT_OPERAND_ACCESSORS(BitcodeReaderValueList, Value)
-
class BitcodeReader : public ModuleProvider {
+ LLVMContext* Context;
MemoryBuffer *Buffer;
- BitstreamReader Stream;
+ BitstreamReader StreamFile;
+ BitstreamCursor Stream;
const char *ErrorString;
std::vector<std::pair<GlobalVariable*, unsigned> > GlobalInits;
std::vector<std::pair<GlobalAlias*, unsigned> > AliasInits;
- /// ParamAttrs - The set of parameter attributes by index. Index zero in the
+ /// MAttributes - The set of attributes by index. Index zero in the
/// file is for null, and is thus not represented here. As such all indices
/// are off by one.
- std::vector<PAListPtr> ParamAttrs;
+ std::vector<AttrListPtr> MAttributes;
/// FunctionBBs - While parsing a function body, this is a list of the basic
/// blocks for the function.
/// stream) and what linkage the original function had.
DenseMap<Function*, std::pair<uint64_t, unsigned> > DeferredFunctionInfo;
public:
- explicit BitcodeReader(MemoryBuffer *buffer)
- : Buffer(buffer), ErrorString(0) {
+ explicit BitcodeReader(MemoryBuffer *buffer, LLVMContext* C)
+ : Context(C), Buffer(buffer), ErrorString(0) {
HasReversedFunctionsWithBodies = false;
}
~BitcodeReader() {
if (ID >= FunctionBBs.size()) return 0; // Invalid ID
return FunctionBBs[ID];
}
- PAListPtr getParamAttrs(unsigned i) const {
- if (i-1 < ParamAttrs.size())
- return ParamAttrs[i-1];
- return PAListPtr();
+ AttrListPtr getAttributes(unsigned i) const {
+ if (i-1 < MAttributes.size())
+ return MAttributes[i-1];
+ return AttrListPtr();
}
/// getValueTypePair - Read a value/type pair out of the specified record from
bool ParseModule(const std::string &ModuleID);
- bool ParseParamAttrBlock();
+ bool ParseAttributeBlock();
bool ParseTypeTable();
bool ParseTypeSymbolTable();
bool ParseValueSymbolTable();