//
//===----------------------------------------------------------------------===//
-#include "llvm/ValueHolderImpl.h"
#include "llvm/InstrTypes.h"
#include "llvm/SymbolTable.h"
#include "llvm/SymTabValue.h"
-#include "llvm/ConstPoolVals.h"
-#include "llvm/Type.h"
-#ifndef NDEBUG // Only in -g mode...
-#include "llvm/Assembly/Writer.h"
-#endif
+#include "llvm/DerivedTypes.h"
#include <algorithm>
//===----------------------------------------------------------------------===//
// Value Class
//===----------------------------------------------------------------------===//
-Value::Value(const Type *ty, ValueTy vty, const string &name = "")
- : Name(name), Ty(ty, this) {
+static inline const Type *checkType(const Type *Ty) {
+ assert(Ty && "Value defined with a null type: Error!");
+ return Ty;
+}
+
+Value::Value(const Type *ty, ValueTy vty, const std::string &name = "")
+ : Name(name), Ty(checkType(ty), this) {
VTy = vty;
}
// a <badref>
//
if (Uses.begin() != Uses.end()) {
- for (use_const_iterator I = Uses.begin(); I != Uses.end(); ++I)
- cerr << "Use still stuck around after Def is destroyed:" << *I << endl;
+ std::cerr << "While deleting: " << Ty << "%" << Name << "\n";
+ for (use_const_iterator I = Uses.begin(); I != Uses.end(); ++I) {
+ std::cerr << "Use still stuck around after Def is destroyed:";
+ (*I)->dump();
+ std::cerr << "\n";
+ }
}
#endif
assert(Uses.begin() == Uses.end());
void Value::replaceAllUsesWith(Value *D) {
assert(D && "Value::replaceAllUsesWith(<null>) is invalid!");
assert(D != this && "V->replaceAllUsesWith(V) is NOT valid!");
+ assert(D->getType() == getType() &&
+ "replaceAllUses of value with new value of different type!");
while (!Uses.empty()) {
User *Use = Uses.back();
#ifndef NDEBUG
Use->replaceUsesOfWith(this, D);
#ifndef NDEBUG // only in -g mode...
- if (Uses.size() == NumUses)
- cerr << "Use: " << Use << "replace with: " << D;
+ if (Uses.size() == NumUses) {
+ std::cerr << "Use: ";
+ Use->dump();
+ std::cerr << "replace with: ";
+ D->dump();
+ }
#endif
assert(Uses.size() != NumUses && "Didn't remove definition!");
}
// change Ty to point to the right type. :)
//
void Value::refineAbstractType(const DerivedType *OldTy, const Type *NewTy) {
- assert(Ty.get() == (const Type*)OldTy &&"Can't refine anything but my type!");
+ assert(Ty.get() == OldTy &&"Can't refine anything but my type!");
+ if (OldTy == NewTy && !OldTy->isAbstract())
+ Ty.removeUserFromConcrete();
Ty = NewTy;
}
return i;
}
-#ifndef NDEBUG // Only in -g mode...
-void Value::dump() const {
- cerr << this;
-}
-#endif
-
//===----------------------------------------------------------------------===//
// User Class
//===----------------------------------------------------------------------===//
-User::User(const Type *Ty, ValueTy vty, const string &name)
+User::User(const Type *Ty, ValueTy vty, const std::string &name)
: Value(Ty, vty, name) {
}