Fix bugs
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1152 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/LevelRaise.cpp b/lib/Transforms/LevelRaise.cpp
index a40d865..13140b4 100644
--- a/lib/Transforms/LevelRaise.cpp
+++ b/lib/Transforms/LevelRaise.cpp
@@ -375,11 +375,13 @@
if (RetValConvertableToType(CI, Src->getType(), ConvertedTypes)) {
PRINT_PEEPHOLE2("CAST-DEST-EXPR-CONV:in ", CI, Src);
+ //cerr << "\nCONVERTING EXPR TYPE:\n";
ValueMapCache ValueMap;
ConvertUsersType(CI, Src, ValueMap); // This will delete CI!
BI = BB->begin(); // Rescan basic block. BI might be invalidated.
- PRINT_PEEPHOLE1("CAST-DEST-EXPR-CONV:out", I);
+ PRINT_PEEPHOLE1("CAST-DEST-EXPR-CONV:out", Src);
+ //cerr << "DONE CONVERTING EXPR TYPE: ";// << BB->getParent();
return true;
}
}
diff --git a/lib/Transforms/TransformInternals.h b/lib/Transforms/TransformInternals.h
index 5c753c5..94af200 100644
--- a/lib/Transforms/TransformInternals.h
+++ b/lib/Transforms/TransformInternals.h
@@ -29,6 +29,14 @@
bool losslessCastableTypes(const Type *T1, const Type *T2);
+// isFirstClassType - Return true if a value of the specified type can be held
+// in a register.
+//
+static inline bool isFirstClassType(const Type *Ty) {
+ return Ty->isPrimitiveType() || Ty->isPointerType();
+}
+
+
// ReplaceInstWithValue - Replace all uses of an instruction (specified by BI)
// with a value, then remove and delete the original instruction.
//
@@ -51,7 +59,7 @@
// Operands mapped - Contains an entry if the first value (the user) has had
// the second value (the operand) mapped already.
//
- set<pair<const User*, const Value*> > OperandsMapped;
+ set<const User*> OperandsMapped;
// Expression Map - Contains an entry from the old value to the new value of
// an expression that has been converted over.
@@ -75,10 +83,7 @@
class ValueHandle : public Instruction {
ValueHandle(const ValueHandle &); // DO NOT IMPLEMENT
public:
- ValueHandle(Value *V) : Instruction(Type::VoidTy, UserOp1, "") {
- Operands.push_back(Use(V, this));
- }
-
+ ValueHandle(Value *V);
~ValueHandle();
virtual Instruction *clone() const { abort(); return 0; }