Tabs -> spaces, and remove trailing whitespace.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@82355 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp
index 295329b..0ecf847 100644
--- a/lib/AsmParser/LLParser.cpp
+++ b/lib/AsmParser/LLParser.cpp
@@ -45,7 +45,7 @@
t_InlineAsm, // Value in StrVal/StrVal2/UIntVal.
t_Metadata // Value in MetadataVal.
} Kind;
-
+
LLParser::LocTy Loc;
unsigned UIntVal;
std::string StrVal, StrVal2;
@@ -77,27 +77,27 @@
return Error(ForwardRefTypeIDs.begin()->second.second,
"use of undefined type '%" +
utostr(ForwardRefTypeIDs.begin()->first) + "'");
-
+
if (!ForwardRefVals.empty())
return Error(ForwardRefVals.begin()->second.second,
"use of undefined value '@" + ForwardRefVals.begin()->first +
"'");
-
+
if (!ForwardRefValIDs.empty())
return Error(ForwardRefValIDs.begin()->second.second,
"use of undefined value '@" +
utostr(ForwardRefValIDs.begin()->first) + "'");
-
+
if (!ForwardRefMDNodes.empty())
return Error(ForwardRefMDNodes.begin()->second.second,
"use of undefined metadata '!" +
utostr(ForwardRefMDNodes.begin()->first) + "'");
-
+
// Look for intrinsic functions and CallInst that need to be upgraded
for (Module::iterator FI = M->begin(), FE = M->end(); FI != FE; )
UpgradeCallsToIntrinsic(FI++); // must be post-increment, as we remove
-
+
// Check debug info intrinsics.
CheckDebugInfoIntrinsics(M);
return false;
@@ -160,7 +160,7 @@
return true;
break;
}
-
+
case lltok::kw_thread_local: // OptionalThreadLocal
case lltok::kw_addrspace: // OptionalAddrSpace
case lltok::kw_constant: // GlobalType
@@ -177,11 +177,11 @@
bool LLParser::ParseModuleAsm() {
assert(Lex.getKind() == lltok::kw_module);
Lex.Lex();
-
- std::string AsmStr;
+
+ std::string AsmStr;
if (ParseToken(lltok::kw_asm, "expected 'module asm'") ||
ParseStringConstant(AsmStr)) return true;
-
+
const std::string &AsmSoFar = M->getModuleInlineAsm();
if (AsmSoFar.empty())
M->setModuleInlineAsm(AsmStr);
@@ -227,7 +227,7 @@
if (EatIfPresent(lltok::rsquare))
return false;
-
+
std::string Str;
if (ParseStringConstant(Str)) return true;
M->addLibrary(Str);
@@ -263,21 +263,21 @@
PATypeHolder Ty(Type::getVoidTy(Context));
if (ParseType(Ty)) return true;
-
+
// See if this type was previously referenced.
std::map<unsigned, std::pair<PATypeHolder, LocTy> >::iterator
FI = ForwardRefTypeIDs.find(TypeID);
if (FI != ForwardRefTypeIDs.end()) {
if (FI->second.first.get() == Ty)
return Error(TypeLoc, "self referential type is invalid");
-
+
cast<DerivedType>(FI->second.first.get())->refineAbstractTypeTo(Ty);
Ty = FI->second.first.get();
ForwardRefTypeIDs.erase(FI);
}
-
+
NumberedTypes.push_back(Ty);
-
+
return false;
}
@@ -287,14 +287,14 @@
std::string Name = Lex.getStrVal();
LocTy NameLoc = Lex.getLoc();
Lex.Lex(); // eat LocalVar.
-
+
PATypeHolder Ty(Type::getVoidTy(Context));
-
+
if (ParseToken(lltok::equal, "expected '=' after name") ||
ParseToken(lltok::kw_type, "expected 'type' after name") ||
ParseType(Ty))
return true;
-
+
// Set the type name, checking for conflicts as we do so.
bool AlreadyExists = M->addTypeName(Name, Ty);
if (!AlreadyExists) return false;
@@ -311,16 +311,16 @@
Ty = FI->second.first.get();
ForwardRefTypes.erase(FI);
}
-
+
// Inserting a name that is already defined, get the existing name.
const Type *Existing = M->getTypeByName(Name);
assert(Existing && "Conflict but no matching type?!");
-
+
// Otherwise, this is an attempt to redefine a type. That's okay if
// the redefinition is identical to the original.
// FIXME: REMOVE REDEFINITIONS IN LLVM 3.0
if (Existing == Ty) return false;
-
+
// Any other kind of (non-equivalent) redefinition is an error.
return Error(NameLoc, "redefinition of type named '" + Name + "' of type '" +
Ty->getDescription() + "'");
@@ -332,7 +332,7 @@
bool LLParser::ParseDeclare() {
assert(Lex.getKind() == lltok::kw_declare);
Lex.Lex();
-
+
Function *F;
return ParseFunctionHeader(F, false);
}
@@ -342,7 +342,7 @@
bool LLParser::ParseDefine() {
assert(Lex.getKind() == lltok::kw_define);
Lex.Lex();
-
+
Function *F;
return ParseFunctionHeader(F, true) ||
ParseFunctionBody(*F);
@@ -390,7 +390,7 @@
if (ParseOptionalLinkage(Linkage, HasLinkage) ||
ParseOptionalVisibility(Visibility))
return true;
-
+
if (HasLinkage || Lex.getKind() != lltok::kw_alias)
return ParseGlobal(Name, NameLoc, Linkage, HasLinkage, Visibility);
return ParseAlias(Name, NameLoc, Visibility);
@@ -404,14 +404,14 @@
LocTy NameLoc = Lex.getLoc();
std::string Name = Lex.getStrVal();
Lex.Lex();
-
+
bool HasLinkage;
unsigned Linkage, Visibility;
if (ParseToken(lltok::equal, "expected '=' in global variable") ||
ParseOptionalLinkage(Linkage, HasLinkage) ||
ParseOptionalVisibility(Visibility))
return true;
-
+
if (HasLinkage || Lex.getKind() != lltok::kw_alias)
return ParseGlobal(Name, NameLoc, Linkage, HasLinkage, Visibility);
return ParseAlias(Name, NameLoc, Visibility);
@@ -432,7 +432,7 @@
// !{ ..., !42, ... }
unsigned MID = 0;
if (ParseUInt32(MID)) return true;
-
+
// Check existing MDNode.
std::map<unsigned, MetadataBase *>::iterator I = MetadataCache.find(MID);
if (I != MetadataCache.end()) {
@@ -456,7 +456,7 @@
ForwardRefMDNodes[MID] = std::make_pair(FwdNode, Lex.getLoc());
Node = FwdNode;
return false;
-}
+}
///ParseNamedMetadata:
/// !foo = !{ !1, !2 }
@@ -493,7 +493,7 @@
}
/// ParseStandaloneMetadata:
-/// !42 = !{...}
+/// !42 = !{...}
bool LLParser::ParseStandaloneMetadata() {
assert(Lex.getKind() == lltok::Metadata);
Lex.Lex();
@@ -509,7 +509,7 @@
PATypeHolder Ty(Type::getVoidTy(Context));
if (ParseType(Ty, TyLoc))
return true;
-
+
if (Lex.getKind() != lltok::Metadata)
return TokError("Expected metadata here");
@@ -518,7 +518,7 @@
return TokError("Expected '{' here");
SmallVector<Value *, 16> Elts;
- if (ParseMDNodeVector(Elts)
+ if (ParseMDNodeVector(Elts)
|| ParseToken(lltok::rbrace, "expected end of metadata node"))
return true;
@@ -560,7 +560,7 @@
Linkage != GlobalValue::PrivateLinkage &&
Linkage != GlobalValue::LinkerPrivateLinkage)
return Error(LinkageLoc, "invalid linkage type for alias");
-
+
Constant *Aliasee;
LocTy AliaseeLoc = Lex.getLoc();
if (Lex.getKind() != lltok::kw_bitcast &&
@@ -574,7 +574,7 @@
return Error(AliaseeLoc, "invalid aliasee");
Aliasee = ID.ConstantVal;
}
-
+
if (!isa<PointerType>(Aliasee->getType()))
return Error(AliaseeLoc, "alias must have pointer type");
@@ -583,7 +583,7 @@
(GlobalValue::LinkageTypes)Linkage, Name,
Aliasee);
GA->setVisibility((GlobalValue::VisibilityTypes)Visibility);
-
+
// See if this value already exists in the symbol table. If so, it is either
// a redefinition or a definition of a forward reference.
if (GlobalValue *Val =
@@ -600,18 +600,18 @@
if (Val->getType() != GA->getType())
return Error(NameLoc,
"forward reference and definition of alias have different types");
-
+
// If they agree, just RAUW the old value with the alias and remove the
// forward ref info.
Val->replaceAllUsesWith(GA);
Val->eraseFromParent();
ForwardRefVals.erase(I);
}
-
+
// Insert into the module, we know its name won't collide now.
M->getAliasList().push_back(GA);
assert(GA->getNameStr() == Name && "Should not be a name conflict!");
-
+
return false;
}
@@ -629,14 +629,14 @@
unsigned AddrSpace;
bool ThreadLocal, IsConstant;
LocTy TyLoc;
-
+
PATypeHolder Ty(Type::getVoidTy(Context));
if (ParseOptionalToken(lltok::kw_thread_local, ThreadLocal) ||
ParseOptionalAddrSpace(AddrSpace) ||
ParseGlobalType(IsConstant) ||
ParseType(Ty, TyLoc))
return true;
-
+
// If the linkage is specified and is external, then no initializer is
// present.
Constant *Init = 0;
@@ -649,7 +649,7 @@
if (isa<FunctionType>(Ty) || Ty == Type::getLabelTy(Context))
return Error(TyLoc, "invalid type for global variable");
-
+
GlobalVariable *GV = 0;
// See if the global was forward referenced, if so, use the global.
@@ -667,20 +667,20 @@
}
if (GV == 0) {
- GV = new GlobalVariable(*M, Ty, false, GlobalValue::ExternalLinkage, 0,
+ GV = new GlobalVariable(*M, Ty, false, GlobalValue::ExternalLinkage, 0,
Name, 0, false, AddrSpace);
} else {
if (GV->getType()->getElementType() != Ty)
return Error(TyLoc,
"forward reference and definition of global have different types");
-
+
// Move the forward-reference to the correct spot in the module.
M->getGlobalList().splice(M->global_end(), M->getGlobalList(), GV);
}
if (Name.empty())
NumberedVals.push_back(GV);
-
+
// Set the parsed properties on the global.
if (Init)
GV->setInitializer(Init);
@@ -688,11 +688,11 @@
GV->setLinkage((GlobalValue::LinkageTypes)Linkage);
GV->setVisibility((GlobalValue::VisibilityTypes)Visibility);
GV->setThreadLocal(ThreadLocal);
-
+
// Parse attributes on the global.
while (Lex.getKind() == lltok::comma) {
Lex.Lex();
-
+
if (Lex.getKind() == lltok::kw_section) {
Lex.Lex();
GV->setSection(Lex.getStrVal());
@@ -706,7 +706,7 @@
TokError("unknown global variable property!");
}
}
-
+
return false;
}
@@ -725,11 +725,11 @@
Error(Loc, "global variable reference must have pointer type");
return 0;
}
-
+
// Look this name up in the normal function symbol table.
GlobalValue *Val =
cast_or_null<GlobalValue>(M->getValueSymbolTable().lookup(Name));
-
+
// If this is a forward reference for the value, see if we already created a
// forward ref record.
if (Val == 0) {
@@ -738,7 +738,7 @@
if (I != ForwardRefVals.end())
Val = I->second.first;
}
-
+
// If we have the value in the symbol table or fwd-ref table, return it.
if (Val) {
if (Val->getType() == Ty) return Val;
@@ -746,7 +746,7 @@
Val->getType()->getDescription() + "'");
return 0;
}
-
+
// Otherwise, create a new forward reference for this value and remember it.
GlobalValue *FwdVal;
if (const FunctionType *FT = dyn_cast<FunctionType>(PTy->getElementType())) {
@@ -755,13 +755,13 @@
Error(Loc, "function may not return opaque type");
return 0;
}
-
+
FwdVal = Function::Create(FT, GlobalValue::ExternalWeakLinkage, Name, M);
} else {
FwdVal = new GlobalVariable(*M, PTy->getElementType(), false,
GlobalValue::ExternalWeakLinkage, 0, Name);
}
-
+
ForwardRefVals[Name] = std::make_pair(FwdVal, Loc);
return FwdVal;
}
@@ -772,9 +772,9 @@
Error(Loc, "global variable reference must have pointer type");
return 0;
}
-
+
GlobalValue *Val = ID < NumberedVals.size() ? NumberedVals[ID] : 0;
-
+
// If this is a forward reference for the value, see if we already created a
// forward ref record.
if (Val == 0) {
@@ -783,7 +783,7 @@
if (I != ForwardRefValIDs.end())
Val = I->second.first;
}
-
+
// If we have the value in the symbol table or fwd-ref table, return it.
if (Val) {
if (Val->getType() == Ty) return Val;
@@ -791,7 +791,7 @@
Val->getType()->getDescription() + "'");
return 0;
}
-
+
// Otherwise, create a new forward reference for this value and remember it.
GlobalValue *FwdVal;
if (const FunctionType *FT = dyn_cast<FunctionType>(PTy->getElementType())) {
@@ -805,7 +805,7 @@
FwdVal = new GlobalVariable(*M, PTy->getElementType(), false,
GlobalValue::ExternalWeakLinkage, 0, "");
}
-
+
ForwardRefValIDs[ID] = std::make_pair(FwdVal, Loc);
return FwdVal;
}
@@ -858,7 +858,7 @@
return ParseToken(lltok::lparen, "expected '(' in address space") ||
ParseUInt32(AddrSpace) ||
ParseToken(lltok::rparen, "expected ')' in address space");
-}
+}
/// ParseOptionalAttrs - Parse a potentially empty attribute list. AttrKind
/// indicates what kind of attribute list this is: 0: function arg, 1: result,
@@ -867,7 +867,7 @@
bool LLParser::ParseOptionalAttrs(unsigned &Attrs, unsigned AttrKind) {
Attrs = Attribute::None;
LocTy AttrLoc = Lex.getLoc();
-
+
while (1) {
switch (Lex.getKind()) {
case lltok::kw_sext:
@@ -888,10 +888,10 @@
default: // End of attributes.
if (AttrKind != 2 && (Attrs & Attribute::FunctionOnly))
return Error(AttrLoc, "invalid use of function-only attribute");
-
+
if (AttrKind != 0 && AttrKind != 3 && (Attrs & Attribute::ParameterOnly))
return Error(AttrLoc, "invalid use of parameter-only attribute");
-
+
return false;
case lltok::kw_zeroext: Attrs |= Attribute::ZExt; break;
case lltok::kw_signext: Attrs |= Attribute::SExt; break;
@@ -915,7 +915,7 @@
case lltok::kw_noredzone: Attrs |= Attribute::NoRedZone; break;
case lltok::kw_noimplicitfloat: Attrs |= Attribute::NoImplicitFloat; break;
case lltok::kw_naked: Attrs |= Attribute::Naked; break;
-
+
case lltok::kw_align: {
unsigned Alignment;
if (ParseOptionalAlignment(Alignment))
@@ -974,7 +974,7 @@
/// ::= 'default'
/// ::= 'hidden'
/// ::= 'protected'
-///
+///
bool LLParser::ParseOptionalVisibility(unsigned &Res) {
switch (Lex.getKind()) {
default: Res = GlobalValue::DefaultVisibility; return false;
@@ -1020,7 +1020,7 @@
}
break;
}
-
+
Lex.Lex();
return false;
}
@@ -1037,13 +1037,13 @@
Lex.Lex();
MetadataBase *Node;
if (ParseMDNode(Node)) return true;
-
+
Metadata &TheMetadata = M->getContext().getMetadata();
unsigned MDDbgKind = TheMetadata.getMDKind("dbg");
if (!MDDbgKind)
MDDbgKind = TheMetadata.RegisterMDKind("dbg");
MDsOnInst.push_back(std::make_pair(MDDbgKind, cast<MDNode>(Node)));
-
+
return false;
}
@@ -1074,7 +1074,7 @@
} else
return true;
} while (EatIfPresent(lltok::comma));
-
+
return false;
}
@@ -1084,13 +1084,13 @@
bool LLParser::ParseIndexList(SmallVectorImpl<unsigned> &Indices) {
if (Lex.getKind() != lltok::comma)
return TokError("expected ',' as start of index list");
-
+
while (EatIfPresent(lltok::comma)) {
unsigned Idx;
if (ParseUInt32(Idx)) return true;
Indices.push_back(Idx);
}
-
+
return false;
}
@@ -1102,14 +1102,14 @@
bool LLParser::ParseType(PATypeHolder &Result, bool AllowVoid) {
LocTy TypeLoc = Lex.getLoc();
if (ParseTypeRec(Result)) return true;
-
+
// Verify no unresolved uprefs.
if (!UpRefs.empty())
return Error(UpRefs.back().Loc, "invalid unresolved type up reference");
-
+
if (!AllowVoid && Result.get() == Type::getVoidTy(Context))
return Error(TypeLoc, "void type only allowed for function results");
-
+
return false;
}
@@ -1124,26 +1124,26 @@
// If Ty isn't abstract, or if there are no up-references in it, then there is
// nothing to resolve here.
if (!ty->isAbstract() || UpRefs.empty()) return ty;
-
+
PATypeHolder Ty(ty);
#if 0
errs() << "Type '" << Ty->getDescription()
<< "' newly formed. Resolving upreferences.\n"
<< UpRefs.size() << " upreferences active!\n";
#endif
-
+
// If we find any resolvable upreferences (i.e., those whose NestingLevel goes
// to zero), we resolve them all together before we resolve them to Ty. At
// the end of the loop, if there is anything to resolve to Ty, it will be in
// this variable.
OpaqueType *TypeToResolve = 0;
-
+
for (unsigned i = 0; i != UpRefs.size(); ++i) {
// Determine if 'Ty' directly contains this up-references 'LastContainedTy'.
bool ContainsType =
std::find(Ty->subtype_begin(), Ty->subtype_end(),
UpRefs[i].LastContainedTy) != Ty->subtype_end();
-
+
#if 0
errs() << " UR#" << i << " - TypeContains(" << Ty->getDescription() << ", "
<< UpRefs[i].LastContainedTy->getDescription() << ") = "
@@ -1152,15 +1152,15 @@
#endif
if (!ContainsType)
continue;
-
+
// Decrement level of upreference
unsigned Level = --UpRefs[i].NestingLevel;
UpRefs[i].LastContainedTy = Ty;
-
+
// If the Up-reference has a non-zero level, it shouldn't be resolved yet.
if (Level != 0)
continue;
-
+
#if 0
errs() << " * Resolving upreference for " << UpRefs[i].UpRefTy << "\n";
#endif
@@ -1171,10 +1171,10 @@
UpRefs.erase(UpRefs.begin()+i); // Remove from upreference list.
--i; // Do not skip the next element.
}
-
+
if (TypeToResolve)
TypeToResolve->refineAbstractTypeTo(Ty);
-
+
return Ty;
}
@@ -1188,7 +1188,7 @@
case lltok::Type:
// TypeRec ::= 'float' | 'void' (etc)
Result = Lex.getTyVal();
- Lex.Lex();
+ Lex.Lex();
break;
case lltok::kw_opaque:
// TypeRec ::= 'opaque'
@@ -1230,7 +1230,7 @@
}
Lex.Lex();
break;
-
+
case lltok::LocalVarID:
// TypeRec ::= %4
if (Lex.getUIntVal() < NumberedTypes.size())
@@ -1260,12 +1260,12 @@
break;
}
}
-
- // Parse the type suffixes.
+
+ // Parse the type suffixes.
while (1) {
switch (Lex.getKind()) {
// End of type.
- default: return false;
+ default: return false;
// TypeRec ::= TypeRec '*'
case lltok::star:
@@ -1295,7 +1295,7 @@
Result = HandleUpRefs(PointerType::get(Result.get(), AddrSpace));
break;
}
-
+
/// Types '(' ArgTypeListI ')' OptFuncAttrs
case lltok::lparen:
if (ParseFunctionType(Result))
@@ -1314,13 +1314,13 @@
PerFunctionState &PFS) {
if (ParseToken(lltok::lparen, "expected '(' in call"))
return true;
-
+
while (Lex.getKind() != lltok::rparen) {
// If this isn't the first argument, we need a comma.
if (!ArgList.empty() &&
ParseToken(lltok::comma, "expected ',' in argument list"))
return true;
-
+
// Parse the argument.
LocTy ArgLoc;
PATypeHolder ArgTy(Type::getVoidTy(Context));
@@ -1356,7 +1356,7 @@
isVarArg = false;
assert(Lex.getKind() == lltok::lparen);
Lex.Lex(); // eat the (.
-
+
if (Lex.getKind() == lltok::rparen) {
// empty
} else if (Lex.getKind() == lltok::dotdotdot) {
@@ -1367,16 +1367,16 @@
PATypeHolder ArgTy(Type::getVoidTy(Context));
unsigned Attrs;
std::string Name;
-
+
// If we're parsing a type, use ParseTypeRec, because we allow recursive
// types (such as a function returning a pointer to itself). If parsing a
// function prototype, we require fully resolved types.
if ((inType ? ParseTypeRec(ArgTy) : ParseType(ArgTy)) ||
ParseOptionalAttrs(Attrs, 0)) return true;
-
+
if (ArgTy == Type::getVoidTy(Context))
return Error(TypeLoc, "argument can not have void type");
-
+
if (Lex.getKind() == lltok::LocalVar ||
Lex.getKind() == lltok::StringConstant) { // FIXME: REMOVE IN LLVM 3.0
Name = Lex.getStrVal();
@@ -1385,16 +1385,16 @@
if (!FunctionType::isValidArgumentType(ArgTy))
return Error(TypeLoc, "invalid type for function argument");
-
+
ArgList.push_back(ArgInfo(TypeLoc, ArgTy, Attrs, Name));
-
+
while (EatIfPresent(lltok::comma)) {
// Handle ... at end of arg list.
if (EatIfPresent(lltok::dotdotdot)) {
isVarArg = true;
break;
}
-
+
// Otherwise must be an argument type.
TypeLoc = Lex.getLoc();
if ((inType ? ParseTypeRec(ArgTy) : ParseType(ArgTy)) ||
@@ -1413,14 +1413,14 @@
if (!ArgTy->isFirstClassType() && !isa<OpaqueType>(ArgTy))
return Error(TypeLoc, "invalid type for function argument");
-
+
ArgList.push_back(ArgInfo(TypeLoc, ArgTy, Attrs, Name));
}
}
-
+
return ParseToken(lltok::rparen, "expected ')' at end of argument list");
}
-
+
/// ParseFunctionType
/// ::= Type ArgumentList OptionalAttrs
bool LLParser::ParseFunctionType(PATypeHolder &Result) {
@@ -1428,7 +1428,7 @@
if (!FunctionType::isValidReturnType(Result))
return TokError("invalid function return type");
-
+
std::vector<ArgInfo> ArgList;
bool isVarArg;
unsigned Attrs;
@@ -1437,7 +1437,7 @@
// FIXME: Remove in LLVM 3.0
ParseOptionalAttrs(Attrs, 2))
return true;
-
+
// Reject names on the arguments lists.
for (unsigned i = 0, e = ArgList.size(); i != e; ++i) {
if (!ArgList[i].Name.empty())
@@ -1448,11 +1448,11 @@
// FIXME: REJECT ATTRIBUTES ON FUNCTION TYPES in LLVM 3.0
}
}
-
+
std::vector<const Type*> ArgListTy;
for (unsigned i = 0, e = ArgList.size(); i != e; ++i)
ArgListTy.push_back(ArgList[i].Type);
-
+
Result = HandleUpRefs(FunctionType::get(Result.get(),
ArgListTy, isVarArg));
return false;
@@ -1467,7 +1467,7 @@
bool LLParser::ParseStructType(PATypeHolder &Result, bool Packed) {
assert(Lex.getKind() == lltok::lbrace);
Lex.Lex(); // Consume the '{'
-
+
if (EatIfPresent(lltok::rbrace)) {
Result = StructType::get(Context, Packed);
return false;
@@ -1477,27 +1477,27 @@
LocTy EltTyLoc = Lex.getLoc();
if (ParseTypeRec(Result)) return true;
ParamsList.push_back(Result);
-
+
if (Result == Type::getVoidTy(Context))
return Error(EltTyLoc, "struct element can not have void type");
if (!StructType::isValidElementType(Result))
return Error(EltTyLoc, "invalid element type for struct");
-
+
while (EatIfPresent(lltok::comma)) {
EltTyLoc = Lex.getLoc();
if (ParseTypeRec(Result)) return true;
-
+
if (Result == Type::getVoidTy(Context))
return Error(EltTyLoc, "struct element can not have void type");
if (!StructType::isValidElementType(Result))
return Error(EltTyLoc, "invalid element type for struct");
-
+
ParamsList.push_back(Result);
}
-
+
if (ParseToken(lltok::rbrace, "expected '}' at end of struct"))
return true;
-
+
std::vector<const Type*> ParamsListTy;
for (unsigned i = 0, e = ParamsList.size(); i != e; ++i)
ParamsListTy.push_back(ParamsList[i].get());
@@ -1507,32 +1507,32 @@
/// ParseArrayVectorType - Parse an array or vector type, assuming the first
/// token has already been consumed.
-/// TypeRec
+/// TypeRec
/// ::= '[' APSINTVAL 'x' Types ']'
/// ::= '<' APSINTVAL 'x' Types '>'
bool LLParser::ParseArrayVectorType(PATypeHolder &Result, bool isVector) {
if (Lex.getKind() != lltok::APSInt || Lex.getAPSIntVal().isSigned() ||
Lex.getAPSIntVal().getBitWidth() > 64)
return TokError("expected number in address space");
-
+
LocTy SizeLoc = Lex.getLoc();
uint64_t Size = Lex.getAPSIntVal().getZExtValue();
Lex.Lex();
-
+
if (ParseToken(lltok::kw_x, "expected 'x' after element count"))
return true;
LocTy TypeLoc = Lex.getLoc();
PATypeHolder EltTy(Type::getVoidTy(Context));
if (ParseTypeRec(EltTy)) return true;
-
+
if (EltTy == Type::getVoidTy(Context))
return Error(TypeLoc, "array and vector element type cannot be void");
if (ParseToken(isVector ? lltok::greater : lltok::rsquare,
"expected end of sequential type"))
return true;
-
+
if (isVector) {
if (Size == 0)
return Error(SizeLoc, "zero element vector is illegal");
@@ -1573,7 +1573,7 @@
delete I->second.first;
I->second.first = 0;
}
-
+
for (std::map<unsigned, std::pair<Value*, LocTy> >::iterator
I = ForwardRefValIDs.begin(), E = ForwardRefValIDs.end(); I != E; ++I)
if (!isa<BasicBlock>(I->second.first)) {
@@ -1604,7 +1604,7 @@
const Type *Ty, LocTy Loc) {
// Look this name up in the normal function symbol table.
Value *Val = F.getValueSymbolTable().lookup(Name);
-
+
// If this is a forward reference for the value, see if we already created a
// forward ref record.
if (Val == 0) {
@@ -1613,7 +1613,7 @@
if (I != ForwardRefVals.end())
Val = I->second.first;
}
-
+
// If we have the value in the symbol table or fwd-ref table, return it.
if (Val) {
if (Val->getType() == Ty) return Val;
@@ -1624,21 +1624,21 @@
Val->getType()->getDescription() + "'");
return 0;
}
-
+
// Don't make placeholders with invalid type.
if (!Ty->isFirstClassType() && !isa<OpaqueType>(Ty) &&
Ty != Type::getLabelTy(F.getContext())) {
P.Error(Loc, "invalid use of a non-first-class type");
return 0;
}
-
+
// Otherwise, create a new forward reference for this value and remember it.
Value *FwdVal;
- if (Ty == Type::getLabelTy(F.getContext()))
+ if (Ty == Type::getLabelTy(F.getContext()))
FwdVal = BasicBlock::Create(F.getContext(), Name, &F);
else
FwdVal = new Argument(Ty, Name);
-
+
ForwardRefVals[Name] = std::make_pair(FwdVal, Loc);
return FwdVal;
}
@@ -1647,7 +1647,7 @@
LocTy Loc) {
// Look this name up in the normal function symbol table.
Value *Val = ID < NumberedVals.size() ? NumberedVals[ID] : 0;
-
+
// If this is a forward reference for the value, see if we already created a
// forward ref record.
if (Val == 0) {
@@ -1656,7 +1656,7 @@
if (I != ForwardRefValIDs.end())
Val = I->second.first;
}
-
+
// If we have the value in the symbol table or fwd-ref table, return it.
if (Val) {
if (Val->getType() == Ty) return Val;
@@ -1667,20 +1667,20 @@
Val->getType()->getDescription() + "'");
return 0;
}
-
+
if (!Ty->isFirstClassType() && !isa<OpaqueType>(Ty) &&
Ty != Type::getLabelTy(F.getContext())) {
P.Error(Loc, "invalid use of a non-first-class type");
return 0;
}
-
+
// Otherwise, create a new forward reference for this value and remember it.
Value *FwdVal;
- if (Ty == Type::getLabelTy(F.getContext()))
+ if (Ty == Type::getLabelTy(F.getContext()))
FwdVal = BasicBlock::Create(F.getContext(), "", &F);
else
FwdVal = new Argument(Ty);
-
+
ForwardRefValIDs[ID] = std::make_pair(FwdVal, Loc);
return FwdVal;
}
@@ -1696,23 +1696,23 @@
return P.Error(NameLoc, "instructions returning void cannot have a name");
return false;
}
-
+
// If this was a numbered instruction, verify that the instruction is the
// expected value and resolve any forward references.
if (NameStr.empty()) {
// If neither a name nor an ID was specified, just use the next ID.
if (NameID == -1)
NameID = NumberedVals.size();
-
+
if (unsigned(NameID) != NumberedVals.size())
return P.Error(NameLoc, "instruction expected to be numbered '%" +
utostr(NumberedVals.size()) + "'");
-
+
std::map<unsigned, std::pair<Value*, LocTy> >::iterator FI =
ForwardRefValIDs.find(NameID);
if (FI != ForwardRefValIDs.end()) {
if (FI->second.first->getType() != Inst->getType())
- return P.Error(NameLoc, "instruction forward referenced with type '" +
+ return P.Error(NameLoc, "instruction forward referenced with type '" +
FI->second.first->getType()->getDescription() + "'");
FI->second.first->replaceAllUsesWith(Inst);
delete FI->second.first;
@@ -1728,18 +1728,18 @@
FI = ForwardRefVals.find(NameStr);
if (FI != ForwardRefVals.end()) {
if (FI->second.first->getType() != Inst->getType())
- return P.Error(NameLoc, "instruction forward referenced with type '" +
+ return P.Error(NameLoc, "instruction forward referenced with type '" +
FI->second.first->getType()->getDescription() + "'");
FI->second.first->replaceAllUsesWith(Inst);
delete FI->second.first;
ForwardRefVals.erase(FI);
}
-
+
// Set the name on the instruction.
Inst->setName(NameStr);
-
+
if (Inst->getNameStr() != NameStr)
- return P.Error(NameLoc, "multiple definition of local value named '" +
+ return P.Error(NameLoc, "multiple definition of local value named '" +
NameStr + "'");
return false;
}
@@ -1768,11 +1768,11 @@
else
BB = GetBB(Name, Loc);
if (BB == 0) return 0; // Already diagnosed error.
-
+
// Move the block to the end of the function. Forward ref'd blocks are
// inserted wherever they happen to be referenced.
F.getBasicBlockList().splice(F.end(), F.getBasicBlockList(), BB);
-
+
// Remove the block from forward ref sets.
if (Name.empty()) {
ForwardRefValIDs.erase(NumberedVals.size());
@@ -1781,7 +1781,7 @@
// BB forward references are already in the function symbol table.
ForwardRefVals.erase(Name);
}
-
+
return BB;
}
@@ -1839,7 +1839,7 @@
return false;
}
case lltok::APSInt:
- ID.APSIntVal = Lex.getAPSIntVal();
+ ID.APSIntVal = Lex.getAPSIntVal();
ID.Kind = ValID::t_APSInt;
break;
case lltok::APFloat:
@@ -1857,7 +1857,7 @@
case lltok::kw_null: ID.Kind = ValID::t_Null; break;
case lltok::kw_undef: ID.Kind = ValID::t_Undef; break;
case lltok::kw_zeroinitializer: ID.Kind = ValID::t_Zero; break;
-
+
case lltok::lbrace: {
// ValID ::= '{' ConstVector '}'
Lex.Lex();
@@ -1865,7 +1865,7 @@
if (ParseGlobalValueVector(Elts) ||
ParseToken(lltok::rbrace, "expected end of struct constant"))
return true;
-
+
ID.ConstantVal = ConstantStruct::get(Context, Elts.data(),
Elts.size(), false);
ID.Kind = ValID::t_Constant;
@@ -1876,7 +1876,7 @@
// ValID ::= '<' '{' ConstVector '}' '>' --> Packed Struct.
Lex.Lex();
bool isPackedStruct = EatIfPresent(lltok::lbrace);
-
+
SmallVector<Constant*, 16> Elts;
LocTy FirstEltLoc = Lex.getLoc();
if (ParseGlobalValueVector(Elts) ||
@@ -1884,14 +1884,14 @@
ParseToken(lltok::rbrace, "expected end of packed struct")) ||
ParseToken(lltok::greater, "expected end of constant"))
return true;
-
+
if (isPackedStruct) {
ID.ConstantVal =
ConstantStruct::get(Context, Elts.data(), Elts.size(), true);
ID.Kind = ValID::t_Constant;
return false;
}
-
+
if (Elts.empty())
return Error(ID.Loc, "constant vector must not be empty");
@@ -1899,14 +1899,14 @@
!Elts[0]->getType()->isFloatingPoint())
return Error(FirstEltLoc,
"vector elements must have integer or floating point type");
-
+
// Verify that all the vector elements have the same type.
for (unsigned i = 1, e = Elts.size(); i != e; ++i)
if (Elts[i]->getType() != Elts[0]->getType())
return Error(FirstEltLoc,
"vector element #" + utostr(i) +
" is not of type '" + Elts[0]->getType()->getDescription());
-
+
ID.ConstantVal = ConstantVector::get(Elts.data(), Elts.size());
ID.Kind = ValID::t_Constant;
return false;
@@ -1926,13 +1926,13 @@
ID.Kind = ValID::t_EmptyArray;
return false;
}
-
+
if (!Elts[0]->getType()->isFirstClassType())
- return Error(FirstEltLoc, "invalid array element type: " +
+ return Error(FirstEltLoc, "invalid array element type: " +
Elts[0]->getType()->getDescription());
-
+
ArrayType *ATy = ArrayType::get(Elts[0]->getType(), Elts.size());
-
+
// Verify all elements are correct type!
for (unsigned i = 0, e = Elts.size(); i != e; ++i) {
if (Elts[i]->getType() != Elts[0]->getType())
@@ -1940,7 +1940,7 @@
"array element #" + utostr(i) +
" is not of type '" +Elts[0]->getType()->getDescription());
}
-
+
ID.ConstantVal = ConstantArray::get(ATy, Elts.data(), Elts.size());
ID.Kind = ValID::t_Constant;
return false;
@@ -1966,7 +1966,7 @@
ID.Kind = ValID::t_InlineAsm;
return false;
}
-
+
case lltok::kw_trunc:
case lltok::kw_zext:
case lltok::kw_sext:
@@ -1976,9 +1976,9 @@
case lltok::kw_uitofp:
case lltok::kw_sitofp:
case lltok::kw_fptoui:
- case lltok::kw_fptosi:
+ case lltok::kw_fptosi:
case lltok::kw_inttoptr:
- case lltok::kw_ptrtoint: {
+ case lltok::kw_ptrtoint: {
unsigned Opc = Lex.getUIntVal();
PATypeHolder DestTy(Type::getVoidTy(Context));
Constant *SrcVal;
@@ -1993,7 +1993,7 @@
return Error(ID.Loc, "invalid cast opcode for cast from '" +
SrcVal->getType()->getDescription() + "' to '" +
DestTy->getDescription() + "'");
- ID.ConstantVal = ConstantExpr::getCast((Instruction::CastOps)Opc,
+ ID.ConstantVal = ConstantExpr::getCast((Instruction::CastOps)Opc,
SrcVal, DestTy);
ID.Kind = ValID::t_Constant;
return false;
@@ -2050,12 +2050,12 @@
ParseGlobalTypeAndValue(Val1) ||
ParseToken(lltok::rparen, "expected ')' in compare constantexpr"))
return true;
-
+
if (Val0->getType() != Val1->getType())
return Error(ID.Loc, "compare operands must have the same type");
-
+
CmpInst::Predicate Pred = (CmpInst::Predicate)PredVal;
-
+
if (Opc == Instruction::FCmp) {
if (!Val0->getType()->isFPOrFPVector())
return Error(ID.Loc, "fcmp requires floating point operands");
@@ -2070,7 +2070,7 @@
ID.Kind = ValID::t_Constant;
return false;
}
-
+
// Binary Operators.
case lltok::kw_add:
case lltok::kw_fadd:
@@ -2133,7 +2133,7 @@
ID.Kind = ValID::t_Constant;
return false;
}
-
+
// Logical Operations
case lltok::kw_shl:
case lltok::kw_lshr:
@@ -2158,8 +2158,8 @@
ID.ConstantVal = ConstantExpr::get(Opc, Val0, Val1);
ID.Kind = ValID::t_Constant;
return false;
- }
-
+ }
+
case lltok::kw_getelementptr:
case lltok::kw_shufflevector:
case lltok::kw_insertelement:
@@ -2175,11 +2175,11 @@
ParseGlobalValueVector(Elts) ||
ParseToken(lltok::rparen, "expected ')' in constantexpr"))
return true;
-
+
if (Opc == Instruction::GetElementPtr) {
if (Elts.size() == 0 || !isa<PointerType>(Elts[0]->getType()))
return Error(ID.Loc, "getelementptr requires pointer operand");
-
+
if (!GetElementPtrInst::getIndexedType(Elts[0]->getType(),
(Value**)(Elts.data() + 1),
Elts.size() - 1))
@@ -2219,12 +2219,12 @@
ID.ConstantVal =
ConstantExpr::getInsertElement(Elts[0], Elts[1],Elts[2]);
}
-
+
ID.Kind = ValID::t_Constant;
return false;
}
}
-
+
Lex.Lex();
return false;
}
@@ -2243,9 +2243,9 @@
Constant *&V) {
if (isa<FunctionType>(Ty))
return Error(ID.Loc, "functions are not values, refer to them as pointers");
-
+
switch (ID.Kind) {
- default: llvm_unreachable("Unknown ValID!");
+ default: llvm_unreachable("Unknown ValID!");
case ValID::t_Metadata:
return Error(ID.Loc, "invalid use of metadata");
case ValID::t_LocalID:
@@ -2269,7 +2269,7 @@
if (!Ty->isFloatingPoint() ||
!ConstantFP::isValueValidForType(Ty, ID.APFloatVal))
return Error(ID.Loc, "floating point constant invalid for type");
-
+
// The lexer has no type info, so builds all float and double FP constants
// as double. Fix this here. Long double does not need this.
if (&ID.APFloatVal.getSemantics() == &APFloat::IEEEdouble &&
@@ -2279,11 +2279,11 @@
&Ignored);
}
V = ConstantFP::get(Context, ID.APFloatVal);
-
+
if (V->getType() != Ty)
return Error(ID.Loc, "floating point constant does not have type '" +
Ty->getDescription() + "'");
-
+
return false;
case ValID::t_Null:
if (!isa<PointerType>(Ty))
@@ -2315,12 +2315,12 @@
return false;
}
}
-
+
bool LLParser::ParseGlobalTypeAndValue(Constant *&V) {
PATypeHolder Type(Type::getVoidTy(Context));
return ParseType(Type) ||
ParseGlobalValue(Type, V);
-}
+}
/// ParseGlobalValueVector
/// ::= /*empty*/
@@ -2332,16 +2332,16 @@
Lex.getKind() == lltok::greater ||
Lex.getKind() == lltok::rparen)
return false;
-
+
Constant *C;
if (ParseGlobalTypeAndValue(C)) return true;
Elts.push_back(C);
-
+
while (EatIfPresent(lltok::comma)) {
if (ParseGlobalTypeAndValue(C)) return true;
Elts.push_back(C);
}
-
+
return false;
}
@@ -2397,7 +2397,7 @@
// Parse the linkage.
LocTy LinkageLoc = Lex.getLoc();
unsigned Linkage;
-
+
unsigned Visibility, RetAttrs;
CallingConv::ID CC;
PATypeHolder RetType(Type::getVoidTy(Context));
@@ -2435,11 +2435,11 @@
case GlobalValue::CommonLinkage:
return Error(LinkageLoc, "invalid function linkage type");
}
-
+
if (!FunctionType::isValidReturnType(RetType) ||
isa<OpaqueType>(RetType))
return Error(RetTypeLoc, "invalid function return type");
-
+
LocTy NameLoc = Lex.getLoc();
std::string FunctionName;
@@ -2454,12 +2454,12 @@
} else {
return TokError("expected function name");
}
-
+
Lex.Lex();
-
+
if (Lex.getKind() != lltok::lparen)
return TokError("expected '(' in function argument list");
-
+
std::vector<ArgInfo> ArgList;
bool isVarArg;
unsigned FuncAttrs;
@@ -2481,22 +2481,22 @@
Alignment = Attribute::getAlignmentFromAttrs(FuncAttrs);
FuncAttrs &= ~Attribute::Alignment;
}
-
+
// Okay, if we got here, the function is syntactically valid. Convert types
// and do semantic checks.
std::vector<const Type*> ParamTypeList;
SmallVector<AttributeWithIndex, 8> Attrs;
- // FIXME : In 3.0, stop accepting zext, sext and inreg as optional function
+ // FIXME : In 3.0, stop accepting zext, sext and inreg as optional function
// attributes.
unsigned ObsoleteFuncAttrs = Attribute::ZExt|Attribute::SExt|Attribute::InReg;
if (FuncAttrs & ObsoleteFuncAttrs) {
RetAttrs |= FuncAttrs & ObsoleteFuncAttrs;
FuncAttrs &= ~ObsoleteFuncAttrs;
}
-
+
if (RetAttrs != Attribute::None)
Attrs.push_back(AttributeWithIndex::get(0, RetAttrs));
-
+
for (unsigned i = 0, e = ArgList.size(); i != e; ++i) {
ParamTypeList.push_back(ArgList[i].Type);
if (ArgList[i].Attrs != Attribute::None)
@@ -2507,11 +2507,11 @@
Attrs.push_back(AttributeWithIndex::get(~0, FuncAttrs));
AttrListPtr PAL = AttrListPtr::get(Attrs.begin(), Attrs.end());
-
+
if (PAL.paramHasAttr(1, Attribute::StructRet) &&
RetType != Type::getVoidTy(Context))
- return Error(RetTypeLoc, "functions with 'sret' argument must return void");
-
+ return Error(RetTypeLoc, "functions with 'sret' argument must return void");
+
const FunctionType *FT =
FunctionType::get(RetType, ParamTypeList, isVarArg);
const PointerType *PFT = PointerType::getUnqual(FT);
@@ -2542,7 +2542,7 @@
AI->setName("");
}
}
-
+
} else {
// If this is a definition of a forward referenced function, make sure the
// types agree.
@@ -2564,7 +2564,7 @@
if (FunctionName.empty())
NumberedVals.push_back(Fn);
-
+
Fn->setLinkage((GlobalValue::LinkageTypes)Linkage);
Fn->setVisibility((GlobalValue::VisibilityTypes)Visibility);
Fn->setCallingConv(CC);
@@ -2572,21 +2572,21 @@
Fn->setAlignment(Alignment);
Fn->setSection(Section);
if (!GC.empty()) Fn->setGC(GC.c_str());
-
+
// Add all of the arguments we parsed to the function.
Function::arg_iterator ArgIt = Fn->arg_begin();
for (unsigned i = 0, e = ArgList.size(); i != e; ++i, ++ArgIt) {
// If the argument has a name, insert it into the argument symbol table.
if (ArgList[i].Name.empty()) continue;
-
+
// Set the name, if it conflicted, it will be auto-renamed.
ArgIt->setName(ArgList[i].Name);
-
+
if (ArgIt->getNameStr() != ArgList[i].Name)
return Error(ArgList[i].Loc, "redefinition of argument '%" +
ArgList[i].Name + "'");
}
-
+
return false;
}
@@ -2599,15 +2599,15 @@
if (Lex.getKind() != lltok::lbrace && Lex.getKind() != lltok::kw_begin)
return TokError("expected '{' in function body");
Lex.Lex(); // eat the {.
-
+
PerFunctionState PFS(*this, Fn);
-
+
while (Lex.getKind() != lltok::rbrace && Lex.getKind() != lltok::kw_end)
if (ParseBasicBlock(PFS)) return true;
-
+
// Eat the }.
Lex.Lex();
-
+
// Verify function is ok.
return PFS.VerifyFunctionComplete();
}
@@ -2622,12 +2622,12 @@
Name = Lex.getStrVal();
Lex.Lex();
}
-
+
BasicBlock *BB = PFS.DefineBB(Name, NameLoc);
if (BB == 0) return true;
-
+
std::string NameStr;
-
+
// Parse the instructions in this block until we get a terminator.
Instruction *Inst;
do {
@@ -2636,7 +2636,7 @@
LocTy NameLoc = Lex.getLoc();
int NameID = -1;
NameStr = "";
-
+
if (Lex.getKind() == lltok::LocalVarID) {
NameID = Lex.getUIntVal();
Lex.Lex();
@@ -2657,8 +2657,8 @@
// Set metadata attached with this instruction.
Metadata &TheMetadata = M->getContext().getMetadata();
- for (SmallVector<std::pair<MDKindID, MDNode *>, 2>::iterator
- MDI = MDsOnInst.begin(), MDE = MDsOnInst.end(); MDI != MDE; ++MDI)
+ for (SmallVector<std::pair<MDKindID, MDNode *>, 2>::iterator
+ MDI = MDsOnInst.begin(), MDE = MDsOnInst.end(); MDI != MDE; ++MDI)
TheMetadata.setMD(MDI->first, MDI->second, Inst);
MDsOnInst.clear();
@@ -2667,7 +2667,7 @@
// Set the name on the instruction.
if (PFS.SetInstName(NameID, NameStr, NameLoc, Inst)) return true;
} while (!isa<TerminatorInst>(Inst));
-
+
return false;
}
@@ -2685,7 +2685,7 @@
LocTy Loc = Lex.getLoc();
unsigned KeywordVal = Lex.getUIntVal();
Lex.Lex(); // Eat the keyword.
-
+
switch (Token) {
default: return Error(Loc, "expected instruction opcode");
// Terminator Instructions.
@@ -2763,7 +2763,7 @@
case lltok::kw_uitofp:
case lltok::kw_sitofp:
case lltok::kw_fptoui:
- case lltok::kw_fptosi:
+ case lltok::kw_fptosi:
case lltok::kw_inttoptr:
case lltok::kw_ptrtoint: return ParseCast(Inst, PFS, KeywordVal);
// Other.
@@ -2843,20 +2843,20 @@
/// ParseRet - Parse a return instruction.
/// ::= 'ret' void (',' 'dbg' !1)
/// ::= 'ret' TypeAndValue (',' 'dbg' !1)
-/// ::= 'ret' TypeAndValue (',' TypeAndValue)+ (',' 'dbg' !1)
+/// ::= 'ret' TypeAndValue (',' TypeAndValue)+ (',' 'dbg' !1)
/// [[obsolete: LLVM 3.0]]
bool LLParser::ParseRet(Instruction *&Inst, BasicBlock *BB,
PerFunctionState &PFS) {
PATypeHolder Ty(Type::getVoidTy(Context));
if (ParseType(Ty, true /*void allowed*/)) return true;
-
+
if (Ty == Type::getVoidTy(Context)) {
if (EatIfPresent(lltok::comma))
if (ParseOptionalDbgInfo()) return true;
Inst = ReturnInst::Create(Context);
return false;
}
-
+
Value *RV;
if (ParseValue(Ty, RV, PFS)) return true;
@@ -2870,20 +2870,20 @@
// of 'ret {i32,i32} {i32 1, i32 2}'
SmallVector<Value*, 8> RVs;
RVs.push_back(RV);
-
+
do {
- // If optional 'dbg' is seen then this is the end of MRV.
- if (Lex.getKind() == lltok::kw_dbg)
- break;
- if (ParseTypeAndValue(RV, PFS)) return true;
- RVs.push_back(RV);
+ // If optional 'dbg' is seen then this is the end of MRV.
+ if (Lex.getKind() == lltok::kw_dbg)
+ break;
+ if (ParseTypeAndValue(RV, PFS)) return true;
+ RVs.push_back(RV);
} while (EatIfPresent(lltok::comma));
RV = UndefValue::get(PFS.getFunction().getReturnType());
for (unsigned i = 0, e = RVs.size(); i != e; ++i) {
- Instruction *I = InsertValueInst::Create(RV, RVs[i], i, "mrv");
- BB->getInstList().push_back(I);
- RV = I;
+ Instruction *I = InsertValueInst::Create(RV, RVs[i], i, "mrv");
+ BB->getInstList().push_back(I);
+ RV = I;
}
}
}
@@ -2902,26 +2902,26 @@
LocTy Loc, Loc2;
Value *Op0, *Op1, *Op2;
if (ParseTypeAndValue(Op0, Loc, PFS)) return true;
-
+
if (BasicBlock *BB = dyn_cast<BasicBlock>(Op0)) {
Inst = BranchInst::Create(BB);
return false;
}
-
+
if (Op0->getType() != Type::getInt1Ty(Context))
return Error(Loc, "branch condition must have 'i1' type");
-
+
if (ParseToken(lltok::comma, "expected ',' after branch condition") ||
ParseTypeAndValue(Op1, Loc, PFS) ||
ParseToken(lltok::comma, "expected ',' after true destination") ||
ParseTypeAndValue(Op2, Loc2, PFS))
return true;
-
+
if (!isa<BasicBlock>(Op1))
return Error(Loc, "true destination of branch must be a basic block");
if (!isa<BasicBlock>(Op2))
return Error(Loc2, "true destination of branch must be a basic block");
-
+
Inst = BranchInst::Create(cast<BasicBlock>(Op1), cast<BasicBlock>(Op2), Op0);
return false;
}
@@ -2944,13 +2944,13 @@
return Error(CondLoc, "switch condition must have integer type");
if (!isa<BasicBlock>(DefaultBB))
return Error(BBLoc, "default destination must be a basic block");
-
+
// Parse the jump table pairs.
SmallPtrSet<Value*, 32> SeenCases;
SmallVector<std::pair<ConstantInt*, BasicBlock*>, 32> Table;
while (Lex.getKind() != lltok::rsquare) {
Value *Constant, *DestBB;
-
+
if (ParseTypeAndValue(Constant, CondLoc, PFS) ||
ParseToken(lltok::comma, "expected ',' after case value") ||
ParseTypeAndValue(DestBB, BBLoc, PFS))
@@ -2962,13 +2962,13 @@
return Error(CondLoc, "case value is not a constant integer");
if (!isa<BasicBlock>(DestBB))
return Error(BBLoc, "case destination is not a basic block");
-
+
Table.push_back(std::make_pair(cast<ConstantInt>(Constant),
cast<BasicBlock>(DestBB)));
}
-
+
Lex.Lex(); // Eat the ']'.
-
+
SwitchInst *SI = SwitchInst::Create(Cond, cast<BasicBlock>(DefaultBB),
Table.size());
for (unsigned i = 0, e = Table.size(); i != e; ++i)
@@ -3001,12 +3001,12 @@
ParseToken(lltok::kw_unwind, "expected 'unwind' in invoke") ||
ParseTypeAndValue(UnwindBB, PFS))
return true;
-
+
if (!isa<BasicBlock>(NormalBB))
return Error(CallLoc, "normal destination is not a basic block");
if (!isa<BasicBlock>(UnwindBB))
return Error(CallLoc, "unwind destination is not a basic block");
-
+
// If RetType is a non-function pointer type, then this is the short syntax
// for the call, which means that RetType is just the return type. Infer the
// rest of the function argument types from the arguments that are present.
@@ -3018,18 +3018,18 @@
std::vector<const Type*> ParamTypes;
for (unsigned i = 0, e = ArgList.size(); i != e; ++i)
ParamTypes.push_back(ArgList[i].V->getType());
-
+
if (!FunctionType::isValidReturnType(RetType))
return Error(RetTypeLoc, "Invalid result type for LLVM function");
-
+
Ty = FunctionType::get(RetType, ParamTypes, false);
PFTy = PointerType::getUnqual(Ty);
}
-
+
// Look up the callee.
Value *Callee;
if (ConvertValIDToValue(PFTy, CalleeID, Callee, PFS)) return true;
-
+
// FIXME: In LLVM 3.0, stop accepting zext, sext and inreg as optional
// function attributes.
unsigned ObsoleteFuncAttrs = Attribute::ZExt|Attribute::SExt|Attribute::InReg;
@@ -3037,14 +3037,14 @@
RetAttrs |= FnAttrs & ObsoleteFuncAttrs;
FnAttrs &= ~ObsoleteFuncAttrs;
}
-
+
// Set up the Attributes for the function.
SmallVector<AttributeWithIndex, 8> Attrs;
if (RetAttrs != Attribute::None)
Attrs.push_back(AttributeWithIndex::get(0, RetAttrs));
-
+
SmallVector<Value*, 8> Args;
-
+
// Loop through FunctionType's arguments and ensure they are specified
// correctly. Also, gather any parameter attributes.
FunctionType::param_iterator I = Ty->param_begin();
@@ -3056,7 +3056,7 @@
} else if (!Ty->isVarArg()) {
return Error(ArgList[i].Loc, "too many arguments specified");
}
-
+
if (ExpectedTy && ExpectedTy != ArgList[i].V->getType())
return Error(ArgList[i].Loc, "argument is not of expected type '" +
ExpectedTy->getDescription() + "'");
@@ -3064,16 +3064,16 @@
if (ArgList[i].Attrs != Attribute::None)
Attrs.push_back(AttributeWithIndex::get(i+1, ArgList[i].Attrs));
}
-
+
if (I != E)
return Error(CallLoc, "not enough parameters specified for call");
-
+
if (FnAttrs != Attribute::None)
Attrs.push_back(AttributeWithIndex::get(~0, FnAttrs));
-
+
// Finish off the Attributes and check them
AttrListPtr PAL = AttrListPtr::get(Attrs.begin(), Attrs.end());
-
+
InvokeInst *II = InvokeInst::Create(Callee, cast<BasicBlock>(NormalBB),
cast<BasicBlock>(UnwindBB),
Args.begin(), Args.end());
@@ -3112,10 +3112,10 @@
case 1: Valid = LHS->getType()->isIntOrIntVector(); break;
case 2: Valid = LHS->getType()->isFPOrFPVector(); break;
}
-
+
if (!Valid)
return Error(Loc, "invalid operand type for instruction");
-
+
Inst = BinaryOperator::Create((Instruction::BinaryOps)Opc, LHS, RHS);
return false;
}
@@ -3152,7 +3152,7 @@
ParseToken(lltok::comma, "expected ',' after compare value") ||
ParseValue(LHS->getType(), RHS, PFS))
return true;
-
+
if (Opc == Instruction::FCmp) {
if (!LHS->getType()->isFPOrFPVector())
return Error(Loc, "fcmp requires floating point operands");
@@ -3182,7 +3182,7 @@
ParseToken(lltok::kw_to, "expected 'to' after cast value") ||
ParseType(DestTy))
return true;
-
+
if (!CastInst::castIsValid((Instruction::CastOps)Opc, Op, DestTy)) {
CastInst::castIsValid((Instruction::CastOps)Opc, Op, DestTy);
return Error(Loc, "invalid cast opcode for cast from '" +
@@ -3204,10 +3204,10 @@
ParseToken(lltok::comma, "expected ',' after select value") ||
ParseTypeAndValue(Op2, PFS))
return true;
-
+
if (const char *Reason = SelectInst::areInvalidOperands(Op0, Op1, Op2))
return Error(Loc, Reason);
-
+
Inst = SelectInst::Create(Op0, Op1, Op2);
return false;
}
@@ -3222,7 +3222,7 @@
ParseToken(lltok::comma, "expected ',' after vaarg operand") ||
ParseType(EltTy, TypeLoc))
return true;
-
+
if (!EltTy->isFirstClassType())
return Error(TypeLoc, "va_arg requires operand with first class type");
@@ -3239,10 +3239,10 @@
ParseToken(lltok::comma, "expected ',' after extract value") ||
ParseTypeAndValue(Op1, PFS))
return true;
-
+
if (!ExtractElementInst::isValidOperands(Op0, Op1))
return Error(Loc, "invalid extractelement operands");
-
+
Inst = ExtractElementInst::Create(Op0, Op1);
return false;
}
@@ -3258,10 +3258,10 @@
ParseToken(lltok::comma, "expected ',' after insertelement value") ||
ParseTypeAndValue(Op2, PFS))
return true;
-
+
if (!InsertElementInst::isValidOperands(Op0, Op1, Op2))
return Error(Loc, "invalid insertelement operands");
-
+
Inst = InsertElementInst::Create(Op0, Op1, Op2);
return false;
}
@@ -3277,10 +3277,10 @@
ParseToken(lltok::comma, "expected ',' after shuffle value") ||
ParseTypeAndValue(Op2, PFS))
return true;
-
+
if (!ShuffleVectorInst::isValidOperands(Op0, Op1, Op2))
return Error(Loc, "invalid extractelement operands");
-
+
Inst = new ShuffleVectorInst(Op0, Op1, Op2);
return false;
}
@@ -3291,7 +3291,7 @@
PATypeHolder Ty(Type::getVoidTy(Context));
Value *Op0, *Op1;
LocTy TypeLoc = Lex.getLoc();
-
+
if (ParseType(Ty) ||
ParseToken(lltok::lsquare, "expected '[' in phi value list") ||
ParseValue(Ty, Op0, PFS) ||
@@ -3299,11 +3299,11 @@
ParseValue(Type::getLabelTy(Context), Op1, PFS) ||
ParseToken(lltok::rsquare, "expected ']' in phi value list"))
return true;
-
+
SmallVector<std::pair<Value*, BasicBlock*>, 16> PHIVals;
while (1) {
PHIVals.push_back(std::make_pair(Op0, cast<BasicBlock>(Op1)));
-
+
if (!EatIfPresent(lltok::comma))
break;
@@ -3314,7 +3314,7 @@
ParseToken(lltok::rsquare, "expected ']' in phi value list"))
return true;
}
-
+
if (!Ty->isFirstClassType())
return Error(TypeLoc, "phi node must have first class type");
@@ -3338,7 +3338,7 @@
ValID CalleeID;
SmallVector<ParamInfo, 16> ArgList;
LocTy CallLoc = Lex.getLoc();
-
+
if ((isTail && ParseToken(lltok::kw_call, "expected 'tail call'")) ||
ParseOptionalCallingConv(CC) ||
ParseOptionalAttrs(RetAttrs, 1) ||
@@ -3347,7 +3347,7 @@
ParseParameterList(ArgList, PFS) ||
ParseOptionalAttrs(FnAttrs, 2))
return true;
-
+
// If RetType is a non-function pointer type, then this is the short syntax
// for the call, which means that RetType is just the return type. Infer the
// rest of the function argument types from the arguments that are present.
@@ -3359,18 +3359,18 @@
std::vector<const Type*> ParamTypes;
for (unsigned i = 0, e = ArgList.size(); i != e; ++i)
ParamTypes.push_back(ArgList[i].V->getType());
-
+
if (!FunctionType::isValidReturnType(RetType))
return Error(RetTypeLoc, "Invalid result type for LLVM function");
-
+
Ty = FunctionType::get(RetType, ParamTypes, false);
PFTy = PointerType::getUnqual(Ty);
}
-
+
// Look up the callee.
Value *Callee;
if (ConvertValIDToValue(PFTy, CalleeID, Callee, PFS)) return true;
-
+
// FIXME: In LLVM 3.0, stop accepting zext, sext and inreg as optional
// function attributes.
unsigned ObsoleteFuncAttrs = Attribute::ZExt|Attribute::SExt|Attribute::InReg;
@@ -3383,9 +3383,9 @@
SmallVector<AttributeWithIndex, 8> Attrs;
if (RetAttrs != Attribute::None)
Attrs.push_back(AttributeWithIndex::get(0, RetAttrs));
-
+
SmallVector<Value*, 8> Args;
-
+
// Loop through FunctionType's arguments and ensure they are specified
// correctly. Also, gather any parameter attributes.
FunctionType::param_iterator I = Ty->param_begin();
@@ -3397,7 +3397,7 @@
} else if (!Ty->isVarArg()) {
return Error(ArgList[i].Loc, "too many arguments specified");
}
-
+
if (ExpectedTy && ExpectedTy != ArgList[i].V->getType())
return Error(ArgList[i].Loc, "argument is not of expected type '" +
ExpectedTy->getDescription() + "'");
@@ -3405,7 +3405,7 @@
if (ArgList[i].Attrs != Attribute::None)
Attrs.push_back(AttributeWithIndex::get(i+1, ArgList[i].Attrs));
}
-
+
if (I != E)
return Error(CallLoc, "not enough parameters specified for call");
@@ -3414,7 +3414,7 @@
// Finish off the Attributes and check them
AttrListPtr PAL = AttrListPtr::get(Attrs.begin(), Attrs.end());
-
+
CallInst *CI = CallInst::Create(Callee, Args.begin(), Args.end());
CI->setTailCall(isTail);
CI->setCallingConv(CC);
@@ -3444,7 +3444,7 @@
} else {
if (ParseTypeAndValue(Size, SizeLoc, PFS)) return true;
if (EatIfPresent(lltok::comma))
- if (ParseOptionalInfo(Alignment)) return true;
+ if (ParseOptionalInfo(Alignment)) return true;
}
}
@@ -3476,14 +3476,14 @@
Value *Val; LocTy Loc;
unsigned Alignment = 0;
if (ParseTypeAndValue(Val, Loc, PFS)) return true;
-
+
if (EatIfPresent(lltok::comma))
if (ParseOptionalInfo(Alignment)) return true;
if (!isa<PointerType>(Val->getType()) ||
!cast<PointerType>(Val->getType())->getElementType()->isFirstClassType())
return Error(Loc, "load operand must be a pointer to a first class type");
-
+
Inst = new LoadInst(Val, "", isVolatile, Alignment);
return false;
}
@@ -3501,14 +3501,14 @@
if (EatIfPresent(lltok::comma))
if (ParseOptionalInfo(Alignment)) return true;
-
+
if (!isa<PointerType>(Ptr->getType()))
return Error(PtrLoc, "store operand must be a pointer");
if (!Val->getType()->isFirstClassType())
return Error(Loc, "store operand must be a first class value");
if (cast<PointerType>(Ptr->getType())->getElementType() != Val->getType())
return Error(Loc, "stored value and pointer type do not match");
-
+
Inst = new StoreInst(Val, Ptr, isVolatile, Alignment);
return false;
}
@@ -3523,7 +3523,7 @@
ParseToken(lltok::comma, "expected ',' after getresult operand") ||
ParseUInt32(Element, EltLoc))
return true;
-
+
if (!isa<StructType>(Val->getType()) && !isa<ArrayType>(Val->getType()))
return Error(ValLoc, "getresult inst requires an aggregate operand");
if (!ExtractValueInst::getIndexedType(Val->getType(), Element))
@@ -3540,10 +3540,10 @@
bool InBounds = EatIfPresent(lltok::kw_inbounds);
if (ParseTypeAndValue(Ptr, Loc, PFS)) return true;
-
+
if (!isa<PointerType>(Ptr->getType()))
return Error(Loc, "base of getelementptr must be a pointer");
-
+
SmallVector<Value*, 16> Indices;
while (EatIfPresent(lltok::comma)) {
if (ParseTypeAndValue(Val, EltLoc, PFS)) return true;
@@ -3551,7 +3551,7 @@
return Error(EltLoc, "getelementptr index must be an integer");
Indices.push_back(Val);
}
-
+
if (!GetElementPtrInst::getIndexedType(Ptr->getType(),
Indices.begin(), Indices.end()))
return Error(Loc, "invalid getelementptr indices");
@@ -3590,10 +3590,10 @@
ParseTypeAndValue(Val1, Loc1, PFS) ||
ParseIndexList(Indices))
return true;
-
+
if (!isa<StructType>(Val0->getType()) && !isa<ArrayType>(Val0->getType()))
return Error(Loc0, "extractvalue operand must be array or struct");
-
+
if (!ExtractValueInst::getIndexedType(Val0->getType(), Indices.begin(),
Indices.end()))
return Error(Loc0, "invalid indices for insertvalue");