diff options
Diffstat (limited to 'lib/AsmParser')
| -rw-r--r-- | lib/AsmParser/ParserInternals.h | 8 | ||||
| -rw-r--r-- | lib/AsmParser/llvmAsmParser.y | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/AsmParser/ParserInternals.h b/lib/AsmParser/ParserInternals.h index b05bb0ddac..750833fae8 100644 --- a/lib/AsmParser/ParserInternals.h +++ b/lib/AsmParser/ParserInternals.h @@ -184,8 +184,8 @@ typedef PlaceholderValue<BBPlaceHolderHelper> BBPlaceHolder; 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::LabelTyID: return ((BBPlaceHolder*)Val)->getDef(); @@ -196,8 +196,8 @@ static inline ValID &getValIDFromPlaceHolder(const Value *Val) { 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::LabelTyID: return ((BBPlaceHolder*)Val)->getLineNum(); diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y index acc3cfdb19..28e9fae242 100644 --- a/lib/AsmParser/llvmAsmParser.y +++ b/lib/AsmParser/llvmAsmParser.y @@ -983,7 +983,8 @@ ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr // TODO: GlobalVariable here that includes the said information! // Create a placeholder for the global variable reference... - GlobalVariable *GV = new GlobalVariable(PT->getValueType(), false,true); + GlobalVariable *GV = new GlobalVariable(PT->getElementType(), + false, true); // Keep track of the fact that we have a forward ref to recycle it CurModule.GlobalRefs.insert(make_pair(make_pair(PT, $2), GV)); @@ -1351,7 +1352,7 @@ BBTerminatorInst : RET ResolvedVal { // Return with a result... const MethodType *Ty; if (!(PMTy = dyn_cast<PointerType>($2->get())) || - !(Ty = dyn_cast<MethodType>(PMTy->getValueType()))) { + !(Ty = dyn_cast<MethodType>(PMTy->getElementType()))) { // Pull out the types of all of the arguments... vector<const Type*> ParamTypes; if ($5) { @@ -1487,7 +1488,7 @@ InstVal : BinaryOps Types ValueRef ',' ValueRef { const MethodType *Ty; if (!(PMTy = dyn_cast<PointerType>($2->get())) || - !(Ty = dyn_cast<MethodType>(PMTy->getValueType()))) { + !(Ty = dyn_cast<MethodType>(PMTy->getElementType()))) { // Pull out the types of all of the arguments... vector<const Type*> ParamTypes; if ($5) { |