Fix problem with a cast instruction that must be expanded to type 0
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@929 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Bytecode/Reader/InstructionReader.cpp b/lib/Bytecode/Reader/InstructionReader.cpp
index 58f2656..1f4aa68 100644
--- a/lib/Bytecode/Reader/InstructionReader.cpp
+++ b/lib/Bytecode/Reader/InstructionReader.cpp
@@ -48,6 +48,7 @@
if (read_vbr(Buf, EndBuf, Result.Opcode)) return failure(true);
if (read_vbr(Buf, EndBuf, Typ)) return failure(true);
Result.Ty = getType(Typ);
+ if (Result.Ty == 0) return failure(true);
if (read_vbr(Buf, EndBuf, Result.NumOperands)) return failure(true);
switch (Result.NumOperands) {
@@ -109,10 +110,13 @@
Value *V;
switch (Raw.Opcode) {
- case Instruction::Cast:
- Res = new CastInst(getValue(Raw.Ty, Raw.Arg1), getType(Raw.Arg2));
+ case Instruction::Cast: {
+ V = getValue(Raw.Ty, Raw.Arg1);
+ const Type *Ty = getType(Raw.Arg2);
+ if (V == 0 || Ty == 0) { cerr << "Invalid cast!\n"; return true; }
+ Res = new CastInst(V, Ty);
return false;
-
+ }
case Instruction::PHINode: {
PHINode *PN = new PHINode(Raw.Ty);
switch (Raw.NumOperands) {