#include "llvm/InstrTypes.h"
#include "llvm/BasicBlock.h"
-#include "llvm/ConstPoolVals.h"
+#include "llvm/ConstantVals.h"
#include "llvm/iOther.h"
#include "llvm/Method.h"
#include "llvm/DerivedTypes.h"
#include "llvm/Assembly/Parser.h"
-#include "llvm/Support/StringExtras.h"
+#include "Support/StringExtras.h"
class Module;
abort();
}
}
+
+ bool operator<(const ValID &V) const {
+ if (Type != V.Type) return Type < V.Type;
+ switch (Type) {
+ case NumberVal: return Num < V.Num;
+ case ConstStringVal:
+ case NameVal: return strcmp(Name, V.Name) < 0;
+ case ConstSIntVal: return ConstPool64 < V.ConstPool64;
+ case ConstUIntVal: return UConstPool64 < V.UConstPool64;
+ case ConstFPVal: return ConstPoolFP < V.ConstPoolFP;
+ case ConstNullVal: return false;
+ default: assert(0 && "Unknown value type!"); return false;
+ }
+ }
};
int getLineNum() const { return LineNum; }
};
-struct TypePlaceHolderHelper : public OpaqueType {
- TypePlaceHolderHelper(const Type *Ty) : OpaqueType() {
- assert(Ty == Type::TypeTy);
- }
-};
-
-
struct InstPlaceHolderHelper : public Instruction {
InstPlaceHolderHelper(const Type *Ty) : Instruction(Ty, UserOp1, "") {}
};
struct MethPlaceHolderHelper : public Method {
- MethPlaceHolderHelper(const Type *Ty) : Method(cast<const MethodType>(Ty)) {}
+ MethPlaceHolderHelper(const Type *Ty) : Method(cast<const MethodType>(Ty),
+ true) {}
};
-typedef PlaceholderValue<TypePlaceHolderHelper> TypePlaceHolder;
typedef PlaceholderValue<InstPlaceHolderHelper> ValuePlaceHolder;
typedef PlaceholderValue<BBPlaceHolderHelper> BBPlaceHolder;
-typedef PlaceholderValue<MethPlaceHolderHelper> MethPlaceHolder;
static inline ValID &getValIDFromPlaceHolder(const Value *Val) {
const Type *Ty = Val->getType();
if (isa<PointerType>(Ty) &&
- isa<MethodType>(cast<PointerType>(Ty)->getValueType()))
- Ty = cast<PointerType>(Ty)->getValueType();
+ isa<MethodType>(cast<PointerType>(Ty)->getElementType()))
+ Ty = cast<PointerType>(Ty)->getElementType();
switch (Ty->getPrimitiveID()) {
- case Type::TypeTyID: return ((TypePlaceHolder*)Val)->getDef();
case Type::LabelTyID: return ((BBPlaceHolder*)Val)->getDef();
- case Type::MethodTyID: return ((MethPlaceHolder*)Val)->getDef();
default: return ((ValuePlaceHolder*)Val)->getDef();
}
}
static inline int getLineNumFromPlaceHolder(const Value *Val) {
const Type *Ty = Val->getType();
if (isa<PointerType>(Ty) &&
- isa<MethodType>(cast<PointerType>(Ty)->getValueType()))
- Ty = cast<PointerType>(Ty)->getValueType();
+ isa<MethodType>(cast<PointerType>(Ty)->getElementType()))
+ Ty = cast<PointerType>(Ty)->getElementType();
switch (Ty->getPrimitiveID()) {
- case Type::TypeTyID: return ((TypePlaceHolder*)Val)->getLineNum();
case Type::LabelTyID: return ((BBPlaceHolder*)Val)->getLineNum();
- case Type::MethodTyID: return ((MethPlaceHolder*)Val)->getLineNum();
default: return ((ValuePlaceHolder*)Val)->getLineNum();
}
}