diff options
Diffstat (limited to 'lib/Bytecode/Reader')
| -rw-r--r-- | lib/Bytecode/Reader/ConstantReader.cpp | 2 | ||||
| -rw-r--r-- | lib/Bytecode/Reader/InstructionReader.cpp | 8 | ||||
| -rw-r--r-- | lib/Bytecode/Reader/Reader.cpp | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/Bytecode/Reader/ConstantReader.cpp b/lib/Bytecode/Reader/ConstantReader.cpp index ddeeba3336..671afd2066 100644 --- a/lib/Bytecode/Reader/ConstantReader.cpp +++ b/lib/Bytecode/Reader/ConstantReader.cpp @@ -305,7 +305,7 @@ bool BytecodeParser::parseConstantValue(const uchar *&Buf, const uchar *EndBuf, // Create a placeholder for the global variable reference... GlobalVariable *GVar = - new GlobalVariable(PT->getValueType(), false, true); + new GlobalVariable(PT->getElementType(), false, true); // Keep track of the fact that we have a forward ref to recycle it GlobalRefs.insert(make_pair(make_pair(PT, Slot), GVar)); diff --git a/lib/Bytecode/Reader/InstructionReader.cpp b/lib/Bytecode/Reader/InstructionReader.cpp index 5645e689f0..47d9e820e2 100644 --- a/lib/Bytecode/Reader/InstructionReader.cpp +++ b/lib/Bytecode/Reader/InstructionReader.cpp @@ -227,7 +227,7 @@ bool BytecodeParser::ParseInstruction(const uchar *&Buf, const uchar *EndBuf, // Check to make sure we have a pointer to method type PointerType *PTy = dyn_cast<PointerType>(M->getType()); if (PTy == 0) return failure(true); - MethodType *MTy = dyn_cast<MethodType>(PTy->getValueType()); + MethodType *MTy = dyn_cast<MethodType>(PTy->getElementType()); if (MTy == 0) return failure(true); vector<Value *> Params; @@ -287,7 +287,7 @@ bool BytecodeParser::ParseInstruction(const uchar *&Buf, const uchar *EndBuf, // Check to make sure we have a pointer to method type PointerType *PTy = dyn_cast<PointerType>(M->getType()); if (PTy == 0) return failure(true); - MethodType *MTy = dyn_cast<MethodType>(PTy->getValueType()); + MethodType *MTy = dyn_cast<MethodType>(PTy->getElementType()); if (MTy == 0) return failure(true); vector<Value *> Params; @@ -351,7 +351,7 @@ bool BytecodeParser::ParseInstruction(const uchar *&Buf, const uchar *EndBuf, vector<Value*> Idx; if (!isa<PointerType>(Raw.Ty)) return failure(true); const CompositeType *TopTy = - dyn_cast<CompositeType>(cast<PointerType>(Raw.Ty)->getValueType()); + dyn_cast<CompositeType>(cast<PointerType>(Raw.Ty)->getElementType()); switch (Raw.NumOperands) { case 0: cerr << "Invalid load encountered!\n"; return failure(true); @@ -405,7 +405,7 @@ bool BytecodeParser::ParseInstruction(const uchar *&Buf, const uchar *EndBuf, vector<Value*> Idx; if (!isa<PointerType>(Raw.Ty)) return failure(true); const CompositeType *TopTy = - dyn_cast<CompositeType>(cast<PointerType>(Raw.Ty)->getValueType()); + dyn_cast<CompositeType>(cast<PointerType>(Raw.Ty)->getElementType()); switch (Raw.NumOperands) { case 0: diff --git a/lib/Bytecode/Reader/Reader.cpp b/lib/Bytecode/Reader/Reader.cpp index 84fcd8d8ec..c8be36845a 100644 --- a/lib/Bytecode/Reader/Reader.cpp +++ b/lib/Bytecode/Reader/Reader.cpp @@ -262,7 +262,7 @@ bool BytecodeParser::ParseMethod(const uchar *&Buf, const uchar *EndBuf, } const PointerType *PMTy = MethodSignatureList.front().first; // PtrMeth - const MethodType *MTy = dyn_cast<const MethodType>(PMTy->getValueType()); + const MethodType *MTy = dyn_cast<const MethodType>(PMTy->getElementType()); if (MTy == 0) return failure(true); // Not ptr to method! unsigned isInternal; @@ -392,7 +392,7 @@ bool BytecodeParser::ParseModuleGlobalInfo(const uchar *&Buf, const uchar *End, } const PointerType *PTy = cast<const PointerType>(Ty); - const Type *ElTy = PTy->getValueType(); + const Type *ElTy = PTy->getElementType(); Constant *Initializer = 0; if (VarType & 2) { // Does it have an initalizer? @@ -430,13 +430,13 @@ bool BytecodeParser::ParseModuleGlobalInfo(const uchar *&Buf, const uchar *End, while (MethSignature != Type::VoidTyID) { // List is terminated by Void const Type *Ty = getType(MethSignature); if (!Ty || !isa<PointerType>(Ty) || - !isa<MethodType>(cast<PointerType>(Ty)->getValueType())) { + !isa<MethodType>(cast<PointerType>(Ty)->getElementType())) { Error = "Method not ptr to meth type! Ty = " + Ty->getDescription(); return failure(true); } // We create methods by passing the underlying MethodType to create... - Ty = cast<PointerType>(Ty)->getValueType(); + Ty = cast<PointerType>(Ty)->getElementType(); // When the ModuleGlobalInfo section is read, we load the type of each // method and the 'ModuleValues' slot that it lands in. We then load a |