From dc024674ff96820d6020757b48d47f46d4c07db2 Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Tue, 27 Nov 2007 13:23:08 +0000 Subject: [PATCH] Fix PR1146: parameter attributes are longer part of the function type, instead they belong to functions and function calls. This is an updated and slightly corrected version of Reid Spencer's original patch. The only known problem is that auto-upgrading of bitcode files doesn't seem to work properly (see test/Bitcode/AutoUpgradeIntrinsics.ll). Hopefully a bitcode guru (who might that be? :) ) will fix it. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44359 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/LangRef.html | 16 +- include/llvm/DerivedTypes.h | 19 +- include/llvm/Function.h | 7 +- include/llvm/Instructions.h | 18 +- include/llvm/ParameterAttributes.h | 9 +- include/llvm/Support/CallSite.h | 6 + lib/Analysis/BasicAliasAnalysis.cpp | 4 +- lib/AsmParser/llvmAsmParser.cpp.cvs | 1780 ++-- lib/AsmParser/llvmAsmParser.h.cvs | 12 +- lib/AsmParser/llvmAsmParser.y | 174 +- lib/AsmParser/llvmAsmParser.y.cvs | 237 +- lib/Bitcode/Reader/BitcodeReader.cpp | 31 +- lib/Bitcode/Writer/BitcodeWriter.cpp | 37 +- lib/Bitcode/Writer/ValueEnumerator.cpp | 17 +- lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 22 +- lib/Linker/LinkModules.cpp | 1 + lib/Target/CBackend/CBackend.cpp | 42 +- lib/Target/MSIL/MSILWriter.cpp | 3 +- lib/Target/X86/X86AsmPrinter.cpp | 4 +- lib/Target/X86/X86ISelLowering.cpp | 2 +- lib/Transforms/IPO/ArgumentPromotion.cpp | 35 +- .../IPO/DeadArgumentElimination.cpp | 38 +- lib/Transforms/IPO/ExtractFunction.cpp | 1 + lib/Transforms/IPO/LowerSetJmp.cpp | 2 + lib/Transforms/IPO/PruneEH.cpp | 1 + .../Scalar/InstructionCombining.cpp | 29 +- lib/Transforms/Scalar/LowerGC.cpp | 2 + lib/Transforms/Scalar/SimplifyCFG.cpp | 18 +- lib/Transforms/Utils/CloneFunction.cpp | 5 +- lib/Transforms/Utils/CloneModule.cpp | 3 +- lib/Transforms/Utils/InlineFunction.cpp | 1 + lib/Transforms/Utils/LowerInvoke.cpp | 4 +- lib/Transforms/Utils/SimplifyCFG.cpp | 2 + lib/VMCore/AsmWriter.cpp | 51 +- lib/VMCore/AutoUpgrade.cpp | 11 +- lib/VMCore/Function.cpp | 34 +- lib/VMCore/Instructions.cpp | 44 +- lib/VMCore/Type.cpp | 56 +- lib/VMCore/Verifier.cpp | 6 +- .../Assembler/2006-05-26-VarargsCallEncode.ll | 2 +- test/Assembler/2007-02-07-UpgradeCSRETCC.ll | 4 +- .../Assembler/2007-11-26-AttributeOverload.ll | 4 + .../2007-11-27-AutoUpgradeAttributes.ll | 3 + test/Feature/paramattrs.ll | 2 +- test/Integer/paramattrs_bt.ll | 2 +- .../SimplifyCFG/2006-10-29-InvokeCrash.ll | 2 - tools/llvm-upgrade/UpgradeParser.cpp.cvs | 7676 ++++++++++------- tools/llvm-upgrade/UpgradeParser.h.cvs | 511 +- tools/llvm-upgrade/UpgradeParser.y | 158 +- tools/llvm-upgrade/UpgradeParser.y.cvs | 158 +- tools/llvm2cpp/CppWriter.cpp | 116 +- 51 files changed, 6278 insertions(+), 5144 deletions(-) create mode 100644 test/Assembler/2007-11-26-AttributeOverload.ll create mode 100644 test/Assembler/2007-11-27-AutoUpgradeAttributes.ll diff --git a/docs/LangRef.html b/docs/LangRef.html index 0c2f8ca8c13..f85a441e531 100644 --- a/docs/LangRef.html +++ b/docs/LangRef.html @@ -764,9 +764,9 @@ a power of 2.

The return type and each parameter of a function type may have a set of parameter attributes associated with them. Parameter attributes are used to communicate additional information about the result or parameters of - a function. Parameter attributes are considered to be part of the function - type so two functions types that differ only by the parameter attributes - are different function types.

+ a function. Parameter attributes are considered to be part of the function, + not of the function type, so functions with different parameter attributes + can have the same function type.

Parameter attributes are simple keywords that follow the type specified. If multiple parameter attributes are needed, they are space separated. For @@ -774,15 +774,13 @@ a power of 2.

-%someFunc = i16 (i8 signext %someParam) zeroext
-%someFunc = i16 (i8 zeroext %someParam) zeroext
+declare i32 @printf(i8* noalias , ...) nounwind
+declare i32 @atoi(i8*) nounwind readonly
-

Note that the two function types above are unique because the parameter has - a different attribute (signext in the first one, zeroext in - the second). Also note that the attribute for the function result - (zeroext) comes immediately after the argument list.

+

Note that any attributes for the function result (nounwind, + readonly) come immediately after the argument list.

Currently, only the following parameter attributes are defined:

diff --git a/include/llvm/DerivedTypes.h b/include/llvm/DerivedTypes.h index 1ae8cbd45b9..12219c53542 100644 --- a/include/llvm/DerivedTypes.h +++ b/include/llvm/DerivedTypes.h @@ -31,7 +31,6 @@ class PointerValType; class VectorValType; class IntegerValType; class APInt; -class ParamAttrsList; class DerivedType : public Type { friend class Type; @@ -140,12 +139,11 @@ public: class FunctionType : public DerivedType { friend class TypeMap; bool isVarArgs; - const ParamAttrsList *ParamAttrs; FunctionType(const FunctionType &); // Do not implement const FunctionType &operator=(const FunctionType &); // Do not implement FunctionType(const Type *Result, const std::vector &Params, - bool IsVarArgs, const ParamAttrsList *Attrs = 0); + bool IsVarArgs); public: /// FunctionType::get - This static method is the primary way of constructing @@ -154,12 +152,7 @@ public: static FunctionType *get( const Type *Result, ///< The result type const std::vector &Params, ///< The types of the parameters - bool isVarArg, ///< Whether this is a variable argument length function - const ParamAttrsList *Attrs = 0 - ///< Indicates the parameter attributes to use, if any. The 0th entry - ///< in the list refers to the return type. Parameters are numbered - ///< starting at 1. This argument must be on the heap and FunctionType - ///< owns it after its passed here. + bool isVarArg ///< Whether this is a variable argument length function ); inline bool isVarArg() const { return isVarArgs; } @@ -177,14 +170,6 @@ public: /// unsigned getNumParams() const { return NumContainedTys - 1; } - bool isStructReturn() const; - - /// The parameter attributes for the \p ith parameter are returned. The 0th - /// parameter refers to the return type of the function. - /// @returns The ParameterAttributes for the \p ith parameter. - /// @brief Get the attributes for a parameter - const ParamAttrsList *getParamAttrs() const { return ParamAttrs; } - // Implement the AbstractTypeUser interface. virtual void refineAbstractType(const DerivedType *OldTy, const Type *NewTy); virtual void typeBecameConcrete(const DerivedType *AbsTy); diff --git a/include/llvm/Function.h b/include/llvm/Function.h index 56ed5c26f0b..897e53b0a2d 100644 --- a/include/llvm/Function.h +++ b/include/llvm/Function.h @@ -68,7 +68,7 @@ private: BasicBlockListType BasicBlocks; ///< The basic blocks mutable ArgumentListType ArgumentList; ///< The formal arguments ValueSymbolTable *SymTab; ///< Symbol table of args/instructions - ParamAttrsList *ParamAttrs; ///< Parameter attributes + const ParamAttrsList *ParamAttrs; ///< Parameter attributes // The Calling Convention is stored in Value::SubclassData. /*unsigned CallingConvention;*/ @@ -150,7 +150,10 @@ public: /// Sets the parameter attributes for this Function. To construct a /// ParamAttrsList, see ParameterAttributes.h /// @brief Set the parameter attributes. - void setParamAttrs(ParamAttrsList *attrs); + void setParamAttrs(const ParamAttrsList *attrs); + + /// @brief Determine if the function returns a structure. + bool isStructReturn() const; /// deleteBody - This method deletes the body of the function, and converts /// the linkage to external. diff --git a/include/llvm/Instructions.h b/include/llvm/Instructions.h index ba132cfd58f..96ca43d6cad 100644 --- a/include/llvm/Instructions.h +++ b/include/llvm/Instructions.h @@ -836,7 +836,7 @@ public: /// class CallInst : public Instruction { - ParamAttrsList *ParamAttrs; ///< parameter attributes for call + const ParamAttrsList *ParamAttrs; ///< parameter attributes for call CallInst(const CallInst &CI); void init(Value *Func, Value* const *Params, unsigned NumParams); void init(Value *Func, Value *Actual1, Value *Actual2); @@ -916,12 +916,15 @@ public: /// parameter attributes information, if any. /// @returns 0 if no attributes have been set. /// @brief Get the parameter attributes. - ParamAttrsList *getParamAttrs() const { return ParamAttrs; } + const ParamAttrsList *getParamAttrs() const { return ParamAttrs; } /// Sets the parameter attributes for this CallInst. To construct a /// ParamAttrsList, see ParameterAttributes.h /// @brief Set the parameter attributes. - void setParamAttrs(ParamAttrsList *attrs); + void setParamAttrs(const ParamAttrsList *attrs); + + /// @brief Determine if the call returns a structure. + bool isStructReturn() const; /// getCalledFunction - Return the function being called by this instruction /// if it is a direct call. If it is a call through a function pointer, @@ -1620,7 +1623,7 @@ private: /// calling convention of the call. /// class InvokeInst : public TerminatorInst { - ParamAttrsList *ParamAttrs; + const ParamAttrsList *ParamAttrs; InvokeInst(const InvokeInst &BI); void init(Value *Fn, BasicBlock *IfNormal, BasicBlock *IfException, Value* const *Args, unsigned NumArgs); @@ -1691,12 +1694,15 @@ public: /// parameter attributes information, if any. /// @returns 0 if no attributes have been set. /// @brief Get the parameter attributes. - ParamAttrsList *getParamAttrs() const { return ParamAttrs; } + const ParamAttrsList *getParamAttrs() const { return ParamAttrs; } /// Sets the parameter attributes for this InvokeInst. To construct a /// ParamAttrsList, see ParameterAttributes.h /// @brief Set the parameter attributes. - void setParamAttrs(ParamAttrsList *attrs); + void setParamAttrs(const ParamAttrsList *attrs); + + /// @brief Determine if the call returns a structure. + bool isStructReturn() const; /// getCalledFunction - Return the function called, or null if this is an /// indirect function invocation. diff --git a/include/llvm/ParameterAttributes.h b/include/llvm/ParameterAttributes.h index 1dd98eaa901..79b5d0c2a61 100644 --- a/include/llvm/ParameterAttributes.h +++ b/include/llvm/ParameterAttributes.h @@ -77,7 +77,7 @@ const uint16_t MutuallyIncompatible[3] = { /// with a parameter index. /// @brief ParameterAttributes with a parameter index. struct ParamAttrsWithIndex { - uint16_t attrs; ///< The attributes that are set, |'d together + uint16_t attrs; ///< The attributes that are set, or'd together uint16_t index; ///< Index of the parameter for which the attributes apply static ParamAttrsWithIndex get(uint16_t idx, uint16_t attrs) { @@ -219,6 +219,13 @@ class ParamAttrsList : public FoldingSetNode { /// @brief Return the number of parameter attributes this type has. unsigned size() const { return attrs.size(); } + /// @brief Return the number of references to this ParamAttrsList. + unsigned numRefs() const { return refCount; } + + /// @} + /// @name Mutators + /// @{ + public: /// Classes retaining references to ParamAttrsList objects should call this /// method to increment the reference count. This ensures that the /// ParamAttrsList object will not disappear until the class drops it. diff --git a/include/llvm/Support/CallSite.h b/include/llvm/Support/CallSite.h index fec7efc4cbb..d03d209d5fb 100644 --- a/include/llvm/Support/CallSite.h +++ b/include/llvm/Support/CallSite.h @@ -27,6 +27,7 @@ namespace llvm { class CallInst; class InvokeInst; +class ParamAttrsList; class CallSite { Instruction *I; @@ -57,6 +58,11 @@ public: unsigned getCallingConv() const; void setCallingConv(unsigned CC); + /// getParamAttrs/setParamAttrs - get or set the parameter attributes of + /// the call. + const ParamAttrsList *getParamAttrs() const; + void setParamAttrs(const ParamAttrsList *PAL); + /// getType - Return the type of the instruction that generated this call site /// const Type *getType() const { return I->getType(); } diff --git a/lib/Analysis/BasicAliasAnalysis.cpp b/lib/Analysis/BasicAliasAnalysis.cpp index 2291852c869..82dee547a9f 100644 --- a/lib/Analysis/BasicAliasAnalysis.cpp +++ b/lib/Analysis/BasicAliasAnalysis.cpp @@ -268,7 +268,7 @@ BasicAliasAnalysis::getModRefInfo(CallSite CS, Value *P, unsigned Size) { static bool isNoAliasArgument(const Argument *Arg) { const Function *Func = Arg->getParent(); - const ParamAttrsList *Attr = Func->getFunctionType()->getParamAttrs(); + const ParamAttrsList *Attr = Func->getParamAttrs(); if (Attr) { unsigned Idx = 1; for (Function::const_arg_iterator I = Func->arg_begin(), @@ -839,7 +839,7 @@ BasicAliasAnalysis::getModRefBehavior(Function *F, CallSite CS, return UnknownModRefBehavior; } - const ParamAttrsList *Attrs = F->getFunctionType()->getParamAttrs(); + const ParamAttrsList *Attrs = F->getParamAttrs(); if (Attrs && Attrs->paramHasAttr(0, ParamAttr::ReadNone)) return DoesNotAccessMemory; if (Attrs && Attrs->paramHasAttr(0, ParamAttr::ReadOnly)) diff --git a/lib/AsmParser/llvmAsmParser.cpp.cvs b/lib/AsmParser/llvmAsmParser.cpp.cvs index 4a1534881fe..5907eec5784 100644 --- a/lib/AsmParser/llvmAsmParser.cpp.cvs +++ b/lib/AsmParser/llvmAsmParser.cpp.cvs @@ -214,8 +214,8 @@ NOALIAS = 395, BYVAL = 396, NEST = 397, - CONST = 398, - PURE = 399, + READNONE = 398, + READONLY = 399, DEFAULT = 400, HIDDEN = 401, PROTECTED = 402 @@ -362,8 +362,8 @@ #define NOALIAS 395 #define BYVAL 396 #define NEST 397 -#define CONST 398 -#define PURE 399 +#define READNONE 398 +#define READONLY 399 #define DEFAULT 400 #define HIDDEN 401 #define PROTECTED 402 @@ -372,7 +372,7 @@ /* Copy the first part of user declarations. */ -#line 14 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 14 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" #include "ParserInternals.h" #include "llvm/CallingConv.h" @@ -391,9 +391,6 @@ #include #include #include -#ifndef NDEBUG -#define YYDEBUG 1 -#endif // The following is a gross hack. In order to rid the libAsmParser library of // exceptions, we have to have a way of getting the yyparse function to go into @@ -413,15 +410,6 @@ static bool TriggerError = false; int yyerror(const char *ErrorMsg); // Forward declarations to prevent "implicit int yylex(); // declaration" of xxx warnings. int yyparse(); - -namespace llvm { - std::string CurFilename; -#if YYDEBUG -static cl::opt -Debug("debug-yacc", cl::desc("Print yacc debug state changes"), - cl::Hidden, cl::init(false)); -#endif -} using namespace llvm; static Module *ParserResult; @@ -875,7 +863,7 @@ static Value *getVal(const Type *Ty, const ValID &ID) { // Remember where this forward reference came from. FIXME, shouldn't we try // to recycle these things?? CurModule.PlaceHolderInfo.insert(std::make_pair(V, std::make_pair(ID, - llvmAsmlineno))); + LLLgetLineNo()))); if (inFunctionScope()) InsertValue(V, CurFun.LateResolveValues); @@ -1307,22 +1295,11 @@ static PATypeHolder HandleUpRefs(const Type *ty) { // static Module* RunParser(Module * M); -Module *llvm::RunVMAsmParser(const std::string &Filename, FILE *F) { - set_scan_file(F); - - CurFilename = Filename; - return RunParser(new Module(CurFilename)); -} - -Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) { - set_scan_string(AsmString); - - CurFilename = "from_memory"; - if (M == NULL) { - return RunParser(new Module (CurFilename)); - } else { - return RunParser(M); - } +Module *llvm::RunVMAsmParser(llvm::MemoryBuffer *MB) { + InitLLLexer(MB); + Module *M = RunParser(new Module(LLLgetFilename())); + FreeLexer(); + return M; } @@ -1347,7 +1324,7 @@ Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) { #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 968 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 945 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { llvm::Module *ModuleVal; llvm::Function *FunctionVal; @@ -1394,8 +1371,8 @@ typedef union YYSTYPE llvm::ICmpInst::Predicate IPredicate; llvm::FCmpInst::Predicate FPredicate; } -/* Line 193 of yacc.c. */ -#line 1399 "llvmAsmParser.tab.c" +/* Line 187 of yacc.c. */ +#line 1376 "llvmAsmParser.tab.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -1408,7 +1385,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 1412 "llvmAsmParser.tab.c" +#line 1389 "llvmAsmParser.tab.c" #ifdef short # undef short @@ -1458,7 +1435,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if defined YYENABLE_NLS && YYENABLE_NLS +# if YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -1623,7 +1600,7 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 43 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1754 +#define YYLAST 1816 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 162 @@ -1632,7 +1609,7 @@ union yyalloc /* YYNRULES -- Number of rules. */ #define YYNRULES 314 /* YYNRULES -- Number of states. */ -#define YYNSTATES 602 +#define YYNSTATES 608 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -1720,10 +1697,10 @@ static const yytype_uint16 yyprhs[] = 690, 692, 694, 696, 700, 702, 708, 710, 712, 714, 716, 718, 720, 723, 726, 729, 733, 736, 737, 739, 742, 745, 749, 759, 769, 778, 793, 795, 797, 804, - 810, 813, 820, 828, 832, 836, 842, 848, 849, 850, - 854, 857, 859, 865, 871, 878, 885, 890, 897, 902, - 907, 914, 921, 924, 933, 935, 937, 938, 942, 949, - 953, 960, 963, 969, 977 + 810, 813, 820, 828, 833, 838, 845, 852, 853, 854, + 858, 861, 863, 869, 875, 882, 889, 894, 901, 906, + 911, 918, 925, 928, 937, 939, 941, 942, 946, 953, + 957, 964, 967, 973, 981 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -1752,7 +1729,7 @@ static const yytype_int16 yyrhs[] = 135, -1, 117, -1, 134, -1, 118, -1, 137, -1, 138, -1, 140, -1, 141, -1, 142, -1, -1, 184, 183, -1, 136, -1, 139, -1, 135, -1, 134, -1, - 144, -1, 143, -1, -1, 186, 185, -1, -1, 53, + 143, -1, 144, -1, -1, 186, 185, -1, -1, 53, 4, -1, -1, 149, 53, 4, -1, 34, 22, -1, -1, 189, -1, -1, 149, 192, 191, -1, 189, -1, 53, 4, -1, 11, -1, 12, -1, 13, -1, 16, @@ -1811,60 +1788,60 @@ static const yytype_int16 yyrhs[] = 17, 229, -1, 71, -1, 72, -1, 235, 168, 227, 149, 17, 229, -1, 168, 227, 149, 17, 229, -1, 172, 241, -1, 194, 154, 229, 149, 229, 156, -1, - 237, 149, 154, 229, 149, 229, 156, -1, 194, 229, - 184, -1, 17, 229, 184, -1, 238, 149, 194, 229, - 184, -1, 238, 149, 17, 229, 184, -1, -1, -1, - 239, 149, 230, -1, 56, 55, -1, 55, -1, 163, - 194, 229, 149, 229, -1, 164, 194, 229, 149, 229, - -1, 88, 166, 194, 229, 149, 229, -1, 89, 167, - 194, 229, 149, 229, -1, 165, 230, 38, 194, -1, - 129, 230, 149, 230, 149, 230, -1, 130, 230, 149, - 194, -1, 131, 230, 149, 230, -1, 132, 230, 149, - 230, 149, 230, -1, 133, 230, 149, 230, 149, 230, - -1, 128, 237, -1, 240, 182, 196, 229, 152, 238, - 153, 186, -1, 243, -1, 36, -1, -1, 110, 194, - 188, -1, 110, 194, 149, 11, 229, 188, -1, 111, - 194, 188, -1, 111, 194, 149, 11, 229, 188, -1, - 112, 230, -1, 242, 113, 194, 229, 188, -1, 242, - 114, 230, 149, 194, 229, 188, -1, 115, 194, 229, - 239, -1 + 237, 149, 154, 229, 149, 229, 156, -1, 194, 184, + 229, 184, -1, 17, 184, 229, 184, -1, 238, 149, + 194, 184, 229, 184, -1, 238, 149, 17, 184, 229, + 184, -1, -1, -1, 239, 149, 230, -1, 56, 55, + -1, 55, -1, 163, 194, 229, 149, 229, -1, 164, + 194, 229, 149, 229, -1, 88, 166, 194, 229, 149, + 229, -1, 89, 167, 194, 229, 149, 229, -1, 165, + 230, 38, 194, -1, 129, 230, 149, 230, 149, 230, + -1, 130, 230, 149, 194, -1, 131, 230, 149, 230, + -1, 132, 230, 149, 230, 149, 230, -1, 133, 230, + 149, 230, 149, 230, -1, 128, 237, -1, 240, 182, + 196, 229, 152, 238, 153, 186, -1, 243, -1, 36, + -1, -1, 110, 194, 188, -1, 110, 194, 149, 11, + 229, 188, -1, 111, 194, 188, -1, 111, 194, 149, + 11, 229, 188, -1, 112, 230, -1, 242, 113, 194, + 229, 188, -1, 242, 114, 230, 149, 194, 229, 188, + -1, 115, 194, 229, 239, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 1128, 1128, 1128, 1128, 1128, 1128, 1128, 1128, 1128, - 1128, 1129, 1129, 1129, 1129, 1129, 1129, 1130, 1130, 1130, - 1130, 1130, 1130, 1131, 1131, 1131, 1131, 1131, 1131, 1134, - 1134, 1135, 1135, 1136, 1136, 1137, 1137, 1138, 1138, 1142, - 1142, 1143, 1143, 1144, 1144, 1145, 1145, 1146, 1146, 1147, - 1147, 1148, 1148, 1149, 1150, 1155, 1156, 1156, 1156, 1156, - 1156, 1158, 1158, 1158, 1159, 1159, 1163, 1167, 1172, 1172, - 1174, 1175, 1180, 1186, 1187, 1188, 1189, 1190, 1194, 1195, - 1196, 1200, 1201, 1202, 1203, 1207, 1208, 1209, 1213, 1214, - 1215, 1216, 1217, 1221, 1222, 1223, 1226, 1227, 1228, 1229, - 1230, 1231, 1232, 1239, 1240, 1241, 1242, 1243, 1244, 1245, - 1246, 1247, 1250, 1251, 1256, 1257, 1258, 1259, 1260, 1261, - 1264, 1265, 1272, 1273, 1279, 1280, 1288, 1296, 1297, 1302, - 1303, 1304, 1309, 1322, 1322, 1322, 1322, 1322, 1322, 1322, - 1325, 1329, 1333, 1340, 1345, 1353, 1383, 1414, 1419, 1429, - 1439, 1443, 1453, 1460, 1467, 1474, 1479, 1484, 1491, 1492, - 1499, 1506, 1514, 1520, 1532, 1560, 1576, 1603, 1631, 1657, - 1677, 1703, 1723, 1735, 1742, 1808, 1818, 1828, 1834, 1844, - 1850, 1860, 1865, 1870, 1883, 1895, 1917, 1925, 1931, 1942, - 1947, 1952, 1958, 1964, 1973, 1977, 1985, 1985, 1988, 1988, - 1991, 2003, 2024, 2029, 2037, 2038, 2042, 2042, 2046, 2046, - 2049, 2052, 2076, 2087, 2087, 2098, 2097, 2107, 2106, 2117, - 2157, 2160, 2166, 2176, 2180, 2185, 2187, 2192, 2197, 2206, - 2216, 2227, 2231, 2240, 2249, 2254, 2375, 2375, 2377, 2386, - 2386, 2388, 2393, 2405, 2409, 2414, 2418, 2422, 2426, 2430, - 2434, 2438, 2442, 2446, 2471, 2475, 2485, 2489, 2493, 2498, - 2505, 2505, 2511, 2520, 2524, 2533, 2542, 2551, 2555, 2562, - 2566, 2570, 2575, 2585, 2604, 2613, 2693, 2697, 2704, 2715, - 2728, 2738, 2749, 2759, 2768, 2774, 2783, 2789, 2792, 2793, - 2800, 2804, 2809, 2825, 2842, 2856, 2870, 2882, 2890, 2897, - 2903, 2909, 2915, 2930, 3015, 3020, 3024, 3031, 3038, 3046, - 3053, 3061, 3069, 3083, 3100 + 0, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1105, + 1105, 1106, 1106, 1106, 1106, 1106, 1106, 1107, 1107, 1107, + 1107, 1107, 1107, 1108, 1108, 1108, 1108, 1108, 1108, 1111, + 1111, 1112, 1112, 1113, 1113, 1114, 1114, 1115, 1115, 1119, + 1119, 1120, 1120, 1121, 1121, 1122, 1122, 1123, 1123, 1124, + 1124, 1125, 1125, 1126, 1127, 1132, 1133, 1133, 1133, 1133, + 1133, 1135, 1135, 1135, 1136, 1136, 1140, 1144, 1149, 1149, + 1151, 1152, 1157, 1163, 1164, 1165, 1166, 1167, 1171, 1172, + 1173, 1177, 1178, 1179, 1180, 1184, 1185, 1186, 1190, 1191, + 1192, 1193, 1194, 1198, 1199, 1200, 1203, 1204, 1205, 1206, + 1207, 1208, 1209, 1216, 1217, 1218, 1219, 1220, 1221, 1222, + 1223, 1224, 1227, 1228, 1233, 1234, 1235, 1236, 1237, 1238, + 1241, 1242, 1249, 1250, 1256, 1257, 1265, 1273, 1274, 1279, + 1280, 1281, 1286, 1299, 1299, 1299, 1299, 1299, 1299, 1299, + 1302, 1306, 1310, 1317, 1322, 1330, 1348, 1366, 1371, 1381, + 1391, 1395, 1405, 1412, 1421, 1428, 1433, 1438, 1445, 1446, + 1453, 1460, 1468, 1474, 1486, 1514, 1530, 1557, 1585, 1611, + 1631, 1657, 1677, 1689, 1696, 1762, 1772, 1782, 1788, 1798, + 1804, 1814, 1819, 1824, 1837, 1849, 1871, 1879, 1885, 1896, + 1901, 1906, 1912, 1918, 1927, 1931, 1939, 1939, 1942, 1942, + 1945, 1957, 1978, 1983, 1991, 1992, 1996, 1996, 2000, 2000, + 2003, 2006, 2030, 2041, 2041, 2052, 2051, 2061, 2060, 2071, + 2111, 2114, 2120, 2130, 2134, 2139, 2141, 2146, 2151, 2160, + 2170, 2181, 2185, 2194, 2203, 2208, 2338, 2338, 2340, 2349, + 2349, 2351, 2356, 2368, 2372, 2377, 2381, 2385, 2389, 2393, + 2397, 2401, 2405, 2409, 2434, 2438, 2448, 2452, 2456, 2461, + 2468, 2468, 2474, 2483, 2487, 2496, 2505, 2514, 2518, 2525, + 2529, 2533, 2538, 2548, 2567, 2576, 2660, 2664, 2671, 2682, + 2695, 2705, 2716, 2726, 2737, 2745, 2755, 2762, 2765, 2766, + 2773, 2777, 2782, 2798, 2815, 2829, 2843, 2855, 2863, 2870, + 2876, 2882, 2888, 2903, 2994, 2999, 3003, 3010, 3017, 3025, + 3032, 3040, 3048, 3062, 3079 }; #endif @@ -1894,27 +1871,28 @@ static const char *const yytname[] = "FPEXT", "BITCAST", "UITOFP", "SITOFP", "FPTOUI", "FPTOSI", "INTTOPTR", "PTRTOINT", "PHI_TOK", "SELECT", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR", "SIGNEXT", "ZEROEXT", "NORETURN", - "INREG", "SRET", "NOUNWIND", "NOALIAS", "BYVAL", "NEST", "CONST", "PURE", - "DEFAULT", "HIDDEN", "PROTECTED", "'='", "','", "'*'", "'\\\\'", "'('", - "')'", "'['", "'x'", "']'", "'<'", "'>'", "'{'", "'}'", "'c'", "$accept", - "ArithmeticOps", "LogicalOps", "CastOps", "IPredicates", "FPredicates", - "IntType", "FPType", "LocalName", "OptLocalName", "OptLocalAssign", - "GlobalName", "OptGlobalAssign", "GlobalAssign", "GVInternalLinkage", - "GVExternalLinkage", "GVVisibilityStyle", "FunctionDeclareLinkage", - "FunctionDefineLinkage", "AliasLinkage", "OptCallingConv", "ParamAttr", - "OptParamAttrs", "FuncAttr", "OptFuncAttrs", "OptAlign", "OptCAlign", - "SectionString", "OptSection", "GlobalVarAttributes", - "GlobalVarAttribute", "PrimType", "Types", "ArgType", "ResultTypes", - "ArgTypeList", "ArgTypeListI", "TypeListI", "ConstVal", "ConstExpr", - "ConstVector", "GlobalType", "ThreadLocal", "AliaseeRef", "Module", - "DefinitionList", "Definition", "@1", "@2", "@3", "@4", "@5", "AsmBlock", - "TargetDefinition", "LibrariesDefinition", "LibList", "ArgListH", - "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader", "END", - "Function", "FunctionProto", "OptSideEffect", "ConstValueRef", - "SymbolicValueRef", "ValueRef", "ResolvedVal", "BasicBlockList", - "BasicBlock", "InstructionList", "BBTerminatorInst", "JumpTable", "Inst", - "PHIList", "ParamList", "IndexList", "OptTailCall", "InstVal", - "OptVolatile", "MemoryInst", 0 + "INREG", "SRET", "NOUNWIND", "NOALIAS", "BYVAL", "NEST", "READNONE", + "READONLY", "DEFAULT", "HIDDEN", "PROTECTED", "'='", "','", "'*'", + "'\\\\'", "'('", "')'", "'['", "'x'", "']'", "'<'", "'>'", "'{'", "'}'", + "'c'", "$accept", "ArithmeticOps", "LogicalOps", "CastOps", + "IPredicates", "FPredicates", "IntType", "FPType", "LocalName", + "OptLocalName", "OptLocalAssign", "GlobalName", "OptGlobalAssign", + "GlobalAssign", "GVInternalLinkage", "GVExternalLinkage", + "GVVisibilityStyle", "FunctionDeclareLinkage", "FunctionDefineLinkage", + "AliasLinkage", "OptCallingConv", "ParamAttr", "OptParamAttrs", + "FuncAttr", "OptFuncAttrs", "OptAlign", "OptCAlign", "SectionString", + "OptSection", "GlobalVarAttributes", "GlobalVarAttribute", "PrimType", + "Types", "ArgType", "ResultTypes", "ArgTypeList", "ArgTypeListI", + "TypeListI", "ConstVal", "ConstExpr", "ConstVector", "GlobalType", + "ThreadLocal", "AliaseeRef", "Module", "DefinitionList", "Definition", + "@1", "@2", "@3", "@4", "@5", "AsmBlock", "TargetDefinition", + "LibrariesDefinition", "LibList", "ArgListH", "ArgList", + "FunctionHeaderH", "BEGIN", "FunctionHeader", "END", "Function", + "FunctionProto", "OptSideEffect", "ConstValueRef", "SymbolicValueRef", + "ValueRef", "ResolvedVal", "BasicBlockList", "BasicBlock", + "InstructionList", "BBTerminatorInst", "JumpTable", "Inst", "PHIList", + "ParamList", "IndexList", "OptTailCall", "InstVal", "OptVolatile", + "MemoryInst", 0 }; #endif @@ -2011,7 +1989,7 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 3, 1, 5, 1, 1, 1, 1, 1, 1, 2, 2, 2, 3, 2, 0, 1, 2, 2, 3, 9, 9, 8, 14, 1, 1, 6, 5, - 2, 6, 7, 3, 3, 5, 5, 0, 0, 3, + 2, 6, 7, 4, 4, 6, 6, 0, 0, 3, 2, 1, 5, 5, 6, 6, 4, 6, 4, 4, 6, 6, 2, 8, 1, 1, 0, 3, 6, 3, 6, 2, 5, 7, 4 @@ -2062,7 +2040,7 @@ static const yytype_uint16 yydefact[] = 254, 261, 260, 262, 0, 271, 0, 0, 0, 0, 0, 307, 0, 309, 288, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 117, 116, - 114, 115, 119, 118, 121, 216, 218, 0, 0, 0, + 114, 115, 118, 119, 121, 216, 218, 0, 0, 0, 288, 0, 0, 0, 0, 0, 164, 150, 162, 0, 167, 168, 0, 0, 0, 0, 0, 131, 129, 233, 112, 231, 0, 244, 0, 0, 0, 0, 0, 0, @@ -2074,15 +2052,15 @@ static const yytype_uint16 yydefact[] = 0, 0, 0, 0, 292, 293, 287, 0, 312, 0, 201, 0, 0, 185, 0, 0, 0, 0, 170, 0, 0, 0, 64, 230, 232, 112, 127, 0, 0, 0, - 139, 0, 0, 294, 295, 308, 310, 289, 0, 0, + 112, 112, 0, 294, 295, 308, 310, 289, 0, 0, 297, 300, 301, 0, 124, 0, 0, 0, 191, 0, 0, 187, 188, 184, 65, 128, 122, 255, 0, 0, - 112, 112, 0, 120, 281, 0, 120, 313, 189, 190, + 0, 0, 0, 120, 281, 0, 120, 313, 189, 190, 0, 0, 0, 229, 0, 235, 0, 274, 0, 0, - 284, 283, 139, 0, 0, 282, 303, 186, 192, 193, - 123, 272, 0, 273, 0, 112, 112, 0, 0, 0, - 286, 285, 0, 0, 0, 0, 279, 0, 0, 278, - 0, 275 + 104, 106, 112, 112, 112, 112, 0, 282, 303, 186, + 192, 193, 123, 272, 0, 273, 0, 284, 283, 0, + 0, 0, 0, 0, 112, 112, 0, 0, 0, 286, + 285, 0, 279, 0, 0, 278, 0, 275 }; /* YYDEFGOTO[NTERM-NUM]. */ @@ -2101,84 +2079,84 @@ static const yytype_int16 yydefgoto[] = /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -549 +#define YYPACT_NINF -546 static const yytype_int16 yypact[] = { - 322, -549, -549, -549, -549, -549, -549, -549, -18, -120, - 6, -117, 62, -60, 224, -549, 111, 464, -549, 103, - 184, -12, -7, -549, 21, 133, -549, 1309, -549, -549, - -549, -549, -549, -549, -549, -549, -549, -549, -549, -549, - 140, 140, 211, -549, -549, -549, -549, 140, -549, -549, - -549, -549, -549, 140, 139, -549, -14, 157, 174, 182, - -549, -549, -549, -549, -549, 60, -549, -549, -549, -549, - -549, -549, -549, -549, 215, 233, 2, 526, -549, -549, - -549, 150, -549, 178, 178, 269, -549, 14, 274, 274, - -549, -549, 134, -549, -549, -549, -549, -549, -549, -549, - -23, 54, -549, 97, 105, 993, 60, -549, 150, -125, - -549, 54, 14, 14, -549, -549, 1093, -549, -549, 1340, - 260, -549, -549, -549, -549, -549, 1358, -549, -17, 1584, - -549, 251, -549, -549, 150, -549, 128, 146, 1380, 1380, - 145, -106, 1380, -549, 151, 1340, 1380, 60, 155, 150, - 231, -549, 101, 303, 305, 308, 312, 315, 229, 320, - 808, -549, -549, 187, -549, -549, -549, -549, -549, 275, - 1423, 85, 321, 274, -549, -549, -549, -549, -549, -549, - -549, -549, -549, -549, -549, -549, -549, -549, -549, -549, - -549, 461, 481, 1380, 1380, 1380, 1380, -549, -549, -549, - -549, -549, -549, -549, -549, -549, -549, -549, -549, 1380, - 1380, 1380, 1380, 1380, 1380, 1380, 1380, 1380, -549, 274, - -549, 110, -549, -549, -85, 1116, -549, -2, -33, -549, - 173, 150, -549, -549, 150, 1093, -549, -549, -549, -549, - -549, -549, -549, -549, -549, -549, -549, 461, 481, 191, - 198, 199, 203, 204, 1156, 1534, 1033, 335, 206, 207, - 208, -549, -549, 217, 223, -549, 60, 649, -549, 785, - 785, -549, 785, 1358, -549, -549, -549, -549, -549, -549, - -549, -549, -549, -549, 1380, -549, -549, -549, -549, -549, - -549, -549, -549, -549, -549, -549, -549, -549, -549, -549, - -549, 1380, 107, 113, -549, 649, 26, 218, 236, 237, - 238, 239, 240, 649, 649, 340, 1358, 1380, 1380, -549, - -549, -549, -549, -549, -549, -549, -549, -549, -549, -549, - -549, 162, -549, -549, -549, 162, 217, 217, 344, 242, - 243, 1340, 1340, 1340, 1340, 1340, -549, -549, -9, 1073, - -50, -549, -63, -549, 1340, 1340, 1340, -11, -549, 1187, - -549, -549, -549, -549, -549, -549, -549, -549, 333, 1340, - -549, -549, -549, -549, 247, -549, 248, 785, 649, 649, - 7, -549, 34, -549, -549, 785, 244, 1380, 1380, 1380, - 1380, 1380, 256, 257, 1380, 785, 649, 258, -549, -549, - -549, -549, -549, -549, -549, -549, -549, 1380, 1340, 1340, - -549, 261, 264, 267, 268, 1340, -549, 263, 808, -51, - -549, -549, 270, 273, 362, 396, 419, -549, 217, -549, - 150, 276, 271, -549, 405, -48, 411, 412, 280, 284, - 287, 785, 433, 785, 289, 290, 785, 293, 150, -549, - 294, 295, 785, 785, 150, 296, 297, 1380, 90, 298, - 300, 13, 1340, 1340, 1340, 1340, -549, -549, 299, 1340, - 1340, 1380, -549, -549, -549, -3, 1269, -549, 304, -549, - 785, 785, 1577, 785, 785, 297, -549, 297, 1380, 785, - 306, 1380, 1380, 1380, -549, -549, 1577, 401, -549, 649, - -549, 1340, 1340, -549, 309, 310, 319, 323, -549, 316, - 318, 126, -549, -549, -549, 150, 38, 437, 324, 307, - 785, 649, 44, -549, -549, -549, -549, -549, 325, 785, - -549, -549, -549, 53, 297, 327, 332, 1340, -549, 1340, - 1340, -549, -549, -549, -3, -549, 421, -549, 460, 1, - -549, -549, 1595, -549, -549, 334, -549, -549, -549, -549, - 336, 338, 339, -549, 489, -549, 785, -549, 945, 3, - -85, -85, 785, 649, 86, -549, 162, -549, -549, -549, - -549, -549, 347, -549, 945, -549, -549, 484, 485, 356, - -85, -85, 785, 785, 492, 439, -549, 785, 494, -549, - 785, -549 + 47, -546, -546, -546, -546, -546, -546, -546, -17, -95, + 52, -90, 86, 14, 183, -546, 135, 1758, -546, -10, + 64, 18, 33, -546, 5, 180, -546, 1341, -546, -546, + -546, -546, -546, -546, -546, -546, -546, -546, -546, -546, + 76, 76, 59, -546, -546, -546, -546, 76, -546, -546, + -546, -546, -546, 76, 193, -546, 13, 202, 224, 233, + -546, -546, -546, -546, -546, 111, -546, -546, -546, -546, + -546, -546, -546, -546, 260, 261, 1, 378, -546, -546, + -546, -7, -546, 231, 231, 150, -546, 55, 309, 309, + -546, -546, 100, -546, -546, -546, -546, -546, -546, -546, + -99, 1088, -546, 116, 122, 988, 111, -546, -7, -106, + -546, 1088, 55, 55, -546, -546, 1142, -546, -546, 1359, + 274, -546, -546, -546, -546, -546, 1414, -546, -18, 1624, + -546, 257, -546, -546, -7, -546, 131, 128, 1454, 1454, + 129, -105, 1454, -546, 136, 1359, 1454, 111, 141, -7, + 237, -546, 214, 279, 285, 289, 291, 294, 145, 299, + 803, -546, -546, 103, -546, -546, -546, -546, -546, 254, + 1512, 57, 301, 309, -546, -546, -546, -546, -546, -546, + -546, -546, -546, -546, -546, -546, -546, -546, -546, -546, + -546, 596, 646, 1454, 1454, 1454, 1454, -546, -546, -546, + -546, -546, -546, -546, -546, -546, -546, -546, -546, 1454, + 1454, 1454, 1454, 1454, 1454, 1454, 1454, 1454, -546, 309, + -546, 61, -546, -546, 132, 1182, -546, -57, -69, -546, + 155, -7, -546, -546, -7, 1142, -546, -546, -546, -546, + -546, -546, -546, -546, -546, -546, -546, 596, 646, 162, + 163, 164, 166, 167, 1242, 1530, 1028, 303, 169, 174, + 179, -546, -546, 185, 191, -546, 111, 644, -546, 780, + 780, -546, 780, 1414, -546, -546, -546, -546, -546, -546, + -546, -546, -546, -546, 1454, -546, -546, -546, -546, -546, + -546, -546, -546, -546, -546, -546, -546, -546, -546, -546, + -546, 1454, 30, 48, -546, 644, -21, 197, 199, 203, + 204, 205, 206, 644, 644, 313, 1414, 1454, 1454, -546, + -546, -546, -546, -546, -546, -546, -546, -546, -546, -546, + -546, 201, -546, -546, -546, 201, 185, 185, 320, 207, + 208, 1359, 1359, 1359, 1359, 1359, -546, -546, -65, 1068, + -86, -546, -104, -546, 1359, 1359, 1359, -20, -546, 1261, + -546, -546, -546, -546, -546, -546, -546, -546, 273, 1359, + -546, -546, -546, -546, 217, -546, 218, 780, 644, 644, + 8, -546, 11, -546, -546, 780, 221, 1454, 1454, 1454, + 1454, 1454, 227, 234, 1454, 780, 644, 235, -546, -546, + -546, -546, -546, -546, -546, -546, -546, 1454, 1359, 1359, + -546, 247, 258, 263, 265, 1359, -546, 259, 803, -101, + -546, -546, 269, 270, 344, 398, 419, -546, 185, -546, + -7, 276, 275, -546, 404, -76, 412, 413, 282, 288, + 292, 780, 440, 780, 297, 300, 780, 302, -7, -546, + 304, 308, 780, 780, -7, 306, 310, 1454, -35, 311, + 314, -73, 1359, 1359, 1359, 1359, -546, -546, 315, 1359, + 1359, 1454, -546, -546, -546, 298, 1301, -546, 319, -546, + 780, 780, 1570, 780, 780, 310, -546, 310, 1454, 780, + 322, 1454, 1454, 1454, -546, -546, 1570, 399, -546, 644, + -546, 1359, 1359, -546, 323, 316, 325, 327, -546, 324, + 326, 60, -546, -546, -546, -7, 3, 460, 334, 330, + 82, -7, -13, -546, -546, -546, -546, -546, 332, 780, + -546, -546, -546, 12, 310, 336, 337, 1359, -546, 1359, + 1359, -546, -546, -546, 298, -546, 438, -546, 475, -4, + 493, 493, 1610, -546, -546, 338, -546, -546, -546, -546, + 342, 345, 346, -546, 501, -546, 780, -546, 940, 2, + 354, 355, -546, -546, 82, -7, 72, -546, 201, -546, + -546, -546, -546, -546, 359, -546, 940, 132, 132, 493, + 493, 492, 494, 361, -546, -546, 780, 780, 497, 132, + 132, 450, -546, 780, 505, -546, 780, -546 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -549, 383, 384, 385, 272, 277, -170, -549, 0, -24, - 429, 8, -549, -549, -549, -549, 42, -549, -549, -549, - -160, -549, -421, -549, -228, -549, -293, 11, -549, -310, - -549, -549, -26, 341, -121, -549, 418, 425, -61, -157, - -226, 9, 205, 326, -549, -549, 515, -549, -549, -549, - -549, -549, -549, -549, -549, -549, -549, -549, 446, -549, - -549, -549, -549, -549, -549, -548, -69, 121, -173, -549, - 491, -549, -549, -549, -549, -549, 67, 158, -549, -549, - -549, -549 + -546, 394, 395, 396, 280, 283, -170, -546, 0, -16, + 444, 15, -546, -546, -546, -546, -1, -546, -546, -546, + -157, -546, -418, -546, -229, -546, -292, 23, -546, -307, + -546, -546, -26, 305, -120, -546, 429, 436, -59, -156, + -235, 126, 168, 307, -546, -546, 526, -546, -546, -546, + -546, -546, -546, -546, -546, -546, -546, -546, 456, -546, + -546, -546, -546, -546, -546, -545, -142, 108, -186, -546, + 490, -546, -546, -546, -546, -546, 51, 138, -546, -546, + -546, -546 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -2188,362 +2166,374 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -204 static const yytype_int16 yytable[] = { - 11, 81, 272, 261, 335, 163, 104, 90, 13, 475, - 383, 164, 271, 273, 271, 93, 1, 11, 441, 3, - 582, 5, 304, 425, 142, 13, 405, 406, 24, 350, - 352, 26, 319, 320, 21, 143, 589, 308, 309, 310, - 311, 312, 426, 142, 315, 443, 117, 118, 22, 321, - 322, 108, 323, 324, 230, 325, 326, 327, 161, 316, - 442, 63, 64, 25, 106, 66, 67, 68, 69, 70, - 71, 72, 425, 1, 2, 134, 3, 4, 5, 108, - 27, 236, 83, 84, 233, 134, 415, 442, 28, 88, - 149, 262, 11, 133, 544, 89, 269, 421, 415, 415, - 149, 415, 270, 73, -55, -55, -55, -55, 420, 468, - 479, 43, 227, 228, 319, 320, 231, 110, 474, 111, - 234, 145, 146, 419, 587, 333, 131, 237, 238, 570, - 571, 321, 322, 132, 323, 324, 57, 325, 326, 327, - 415, 58, 165, 435, 267, 397, 94, 416, 110, 45, - 111, 46, 377, 1, 332, 61, 3, 567, 5, 583, - 90, 105, 488, 498, 590, 591, 503, 302, 303, 267, - 305, 264, 398, 399, 400, 59, 110, 401, 111, 97, - 385, 402, 403, 306, 267, 267, 267, 267, 267, 313, - 314, 267, 525, 552, 526, 395, 98, 553, 372, 134, - 372, 372, 552, 372, 99, 74, 556, 2, 75, 149, - 4, 76, 101, 77, 447, 86, 449, 450, 451, 102, - 398, 399, 400, 317, 318, 401, 49, 50, 51, 402, - 403, 52, 239, 240, 241, 242, 372, 103, 63, 64, - 110, 557, 111, 500, 372, 372, 85, 149, 86, 516, - 1, 2, 138, 3, 4, 5, 380, 110, 378, 111, - 139, 261, 382, 110, 162, 111, 29, 30, 31, 32, - 33, 34, 35, 223, 36, 379, 110, 225, 111, 543, - 410, 411, 412, 413, 414, 37, 38, 39, 112, 113, - 149, 396, 267, 422, 423, 424, 398, 399, 400, 226, - 110, 401, 111, 229, 232, 402, 403, 235, 372, 372, - 372, 114, -56, 115, -57, 527, 372, -60, 530, 531, - 532, -59, -203, 418, -58, 574, 372, 372, 576, 243, - 265, 334, 271, 430, 120, 121, 122, 123, 124, 125, - -67, 1, 2, 341, 3, 4, 5, 459, 460, 262, - 342, 343, 6, 7, 466, 344, 345, 353, 354, 355, - 356, 267, 448, 267, 267, 267, 357, 386, 454, 37, - 38, 39, 372, 8, 372, 359, 9, 372, 394, 568, - 10, 458, 407, 372, 372, 387, 388, 389, 390, 391, - 374, 375, 433, 376, 408, 409, 436, 437, 446, 584, - 471, 504, 505, 506, 507, 452, 453, 457, 509, 510, - 462, 372, 372, 463, 372, 372, 464, 465, 472, 469, - 372, 467, 470, 473, 477, 476, 384, 478, 480, 481, - 372, 499, 482, 483, 392, 393, 484, 486, 488, 489, - 535, 536, 491, 492, 493, 511, 497, 501, 496, 502, - 515, 372, 372, 517, 442, 529, 521, 508, 537, 547, - 372, 549, 267, 538, -202, 267, 267, 267, 539, 541, - 521, 542, 540, 548, 564, 512, 560, 566, 561, 562, - 558, 554, -67, 1, 2, 559, 3, 4, 5, 577, - 575, 578, 579, 580, 6, 7, 588, 372, 438, 439, - 440, 592, 593, 372, 372, 594, 445, 285, 286, 597, - 598, 600, 215, 216, 217, 8, 455, 456, 9, 339, - 563, 129, 10, 372, 372, 340, 573, 545, 372, 144, - 141, 372, 44, 63, 64, 128, 106, 66, 67, 68, - 69, 70, 71, 72, 512, 1, 2, 96, 3, 4, - 5, 274, 275, 276, 277, 278, 279, 280, 281, 282, - 283, 338, 485, 533, 487, 0, 330, 490, 461, 0, - 0, 0, 0, 494, 495, 73, 0, 287, 288, 289, - 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, - 300, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 518, 519, 0, 523, 524, 0, 0, 0, 0, - 528, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 534, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 550, 551, 0, 0, 0, 0, 0, 0, 0, - 555, 0, 360, 361, 0, 0, 63, 64, 362, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, - 0, 3, 4, 5, 363, 364, 365, 74, 0, 0, - 75, 0, 0, 76, 0, 77, 107, 581, 0, 366, - 367, 0, 0, 585, 586, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 368, 0, 0, 0, - 0, 0, 0, 595, 596, 0, 0, 0, 599, 0, - 0, 601, 176, 177, 178, 179, 180, 181, 182, 183, - 184, 185, 186, 187, 188, 189, 190, 247, 248, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 249, 197, 198, 199, 200, 201, - 202, 203, 204, 205, 206, 207, 208, 0, 250, 0, - 251, 252, 253, 0, 0, 0, 0, 0, 360, 361, - 0, 0, 63, 64, 362, 0, 0, 0, 0, 110, - 0, 111, 0, 0, 1, 2, 369, 3, 4, 5, - 363, 364, 365, 0, 0, 63, 64, 0, 0, 0, - 0, 0, 0, 0, 0, 366, 367, 1, 2, 0, - 3, 4, 5, 244, 0, 0, 0, 0, 0, 0, - 0, 0, 368, 0, 0, 0, 0, 0, 245, 246, - 0, 0, 0, 0, 0, 0, 0, 0, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, - 188, 189, 190, 247, 248, 0, 0, 0, 0, 0, - 0, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 247, 248, 0, 0, - 249, 197, 198, 199, 200, 201, 202, 203, 204, 205, - 206, 207, 208, 0, 250, 0, 251, 252, 253, 0, - 0, 0, 0, 249, 197, 198, 199, 200, 201, 202, - 203, 204, 205, 206, 207, 208, 0, 250, 0, 251, - 252, 253, 369, 0, 0, 0, 0, 0, 360, 361, - 0, 0, 0, 0, 362, 0, 0, 0, 110, 0, - 111, 0, 254, 0, 0, 255, 0, 256, 0, 257, - 363, 364, 365, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 366, 367, 0, 0, 0, + 11, 81, 272, 335, 261, 104, 163, 271, 236, 304, + 164, 383, 475, 271, 425, 13, 273, 11, 262, 441, + 350, 352, 443, 584, 308, 309, 310, 311, 312, 405, + 406, 315, 13, 426, 90, 21, 45, 425, 46, 83, + 84, 593, 93, 142, 142, 415, 88, -203, 415, 22, + 131, 108, 89, 24, 143, 230, 421, 132, 26, 468, + 161, 442, 316, 415, 442, -67, 1, 2, 269, 3, + 4, 5, 420, 415, 270, 134, 488, 6, 7, 108, + 503, 110, 479, 111, 415, 134, 233, 117, 118, 333, + 149, 416, 11, 110, 85, 111, 86, 544, 8, 332, + 149, 9, 550, 551, 27, 10, 49, 50, 51, 25, + 591, 52, 227, 228, 419, 110, 231, 111, 500, 1, + 234, 474, 3, 2, 5, 372, 4, 372, 372, 110, + 372, 111, 397, 385, 435, 43, 552, 398, 399, 400, + 553, 165, 401, 110, 267, 111, 402, 403, 239, 240, + 241, 242, 567, 377, 587, 588, 589, 590, 585, 59, + 105, 552, 28, 372, 498, 556, 57, 302, 303, 267, + 305, 372, 372, 94, 317, 318, 599, 600, 264, 380, + 110, 58, 111, 306, 267, 267, 267, 267, 267, 313, + 314, 267, 114, 525, 115, 526, 395, 382, 110, 134, + 111, 447, 61, 449, 450, 451, 398, 399, 400, 149, + 110, 401, 111, 543, 90, 402, 403, -55, -55, -55, + -55, 37, 38, 39, 97, 29, 30, 31, 32, 33, + 34, 35, -139, 36, -139, 372, 372, 372, 145, 146, + 237, 238, 557, 372, 63, 64, 98, 149, 516, 319, + 320, 112, 113, 372, 372, 99, 1, 2, 378, 3, + 4, 5, 261, 101, 102, 103, 321, 322, 86, 323, + 324, 138, 325, 326, 327, 379, 262, 139, 162, 223, + 225, 226, 410, 411, 412, 413, 414, 229, -56, 232, + 149, 396, 267, 235, -57, 422, 423, 424, -60, 372, + -59, 372, 527, -58, 372, 530, 531, 532, 243, 265, + 372, 372, 271, 334, 341, 342, 343, 1, 344, 345, + 3, 354, 5, 418, 576, 353, 355, 578, 37, 38, + 39, 356, 433, 430, 357, 398, 399, 400, 372, 372, + 401, 372, 372, 359, 402, 403, 386, 372, 387, 459, + 460, 394, 388, 389, 390, 391, 466, 372, 407, 408, + 409, 267, 448, 267, 267, 267, 436, 437, 454, 120, + 121, 122, 123, 124, 125, 446, 452, 374, 375, 568, + 376, 458, 471, 453, 457, 63, 64, 372, 106, 66, + 67, 68, 69, 70, 71, 72, 462, 1, 2, 586, + 3, 4, 5, 504, 505, 506, 507, 463, 372, 372, + 509, 510, 464, 384, 465, 319, 320, 467, 469, 470, + 472, 392, 393, 473, 372, 476, 478, 73, 477, 480, + 481, 499, 321, 322, 482, 323, 324, 483, 325, 326, + 327, 484, 535, 536, 486, 511, 488, 372, 372, 489, + 515, 491, 442, 492, 372, 372, 521, 493, 496, 497, + 501, 372, 267, 502, 372, 267, 267, 267, 517, 538, + 521, 529, 537, 508, 539, 512, 540, 541, 560, 542, + 561, 562, 547, 548, 549, 438, 439, 440, 554, 558, + 559, 564, 566, 445, 577, 579, 360, 361, 580, 581, + 63, 64, 362, 455, 456, 582, -18, -19, 592, 596, + 598, 597, 1, 2, 603, 3, 4, 5, 363, 364, + 365, 604, 606, 215, 216, 217, 575, 339, 563, 74, + 330, 340, 75, 366, 367, 76, 129, 77, 107, 545, + 144, 141, 338, 44, 512, 128, 96, 533, 461, 485, + 368, 487, 0, 0, 490, 0, 0, 0, 0, 0, + 494, 495, 0, 0, 0, 0, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 247, 248, 0, 0, 0, 0, 0, 518, 519, + 0, 523, 524, 0, 0, 0, 0, 528, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 534, 249, 197, + 570, 571, 200, 201, 202, 203, 204, 205, 206, 207, + 208, 0, 250, 0, 251, 252, 253, 321, 322, 0, + 323, 324, 0, 325, 326, 327, 0, 555, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 360, 361, 0, + 369, 63, 64, 362, 0, 0, 0, 0, 572, 573, + 0, 0, 0, 1, 2, 0, 3, 4, 5, 363, + 364, 365, 285, 286, 583, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 366, 367, 274, 275, 276, 277, + 278, 279, 280, 281, 282, 283, 0, 594, 595, 0, + 0, 368, 0, 0, 601, 602, 0, 0, 0, 0, + 0, 605, 0, 0, 607, 0, 0, 176, 177, 178, + 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, + 189, 190, 247, 248, 0, 0, 0, 0, 0, 0, + 0, 0, 287, 288, 289, 290, 291, 292, 293, 294, + 295, 296, 297, 298, 299, 300, 0, 0, 0, 249, + 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, + 207, 208, 0, 250, 0, 251, 252, 253, 0, 0, + 0, 0, 0, 360, 361, 0, 0, 63, 64, 362, + 0, 0, 0, 0, 110, 0, 111, 0, 0, 1, + 2, 369, 3, 4, 5, 363, 364, 365, 0, 0, + 63, 64, 0, 0, 0, 0, 0, 0, 0, 0, + 366, 367, 1, 2, 0, 3, 4, 5, 244, 0, + 0, 0, 0, 0, 0, 0, 0, 368, 0, 0, + 0, 0, 0, 245, 246, 0, 0, 0, 0, 0, + 0, 0, 0, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 247, 248, + 0, 0, 0, 0, 0, 0, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 247, 248, 0, 0, 249, 197, 198, 199, 200, + 201, 202, 203, 204, 205, 206, 207, 208, 0, 250, + 0, 251, 252, 253, 0, 0, 0, 0, 249, 197, + 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, + 208, 0, 250, 0, 251, 252, 253, 369, 0, 0, + 0, 0, 0, 360, 361, 0, 0, 0, 0, 362, + 0, 0, 0, 110, 0, 111, 0, 254, 0, 0, + 255, 0, 256, 0, 257, 363, 364, 365, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 63, 64, 368, 106, 66, 67, 68, 69, 70, 71, - 72, 0, 1, 2, 0, 3, 4, 5, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, - 188, 189, 190, 247, 248, 0, 0, 0, 0, 0, - 63, 64, 73, 106, 152, 153, 154, 155, 156, 157, - 72, 0, 1, 2, 0, 3, 4, 5, 0, 0, - 249, 197, 198, 199, 200, 201, 202, 203, 204, 205, - 206, 207, 208, 0, 250, 0, 251, 252, 253, 0, - 63, 64, 73, 106, 152, 153, 154, 155, 156, 157, - 72, 0, 1, 2, 0, 3, 4, 5, 0, 0, - 63, 64, 369, 147, 66, 67, 68, 69, 70, 71, - 72, 0, 1, 2, 0, 3, 4, 5, 0, 0, - 0, 0, 73, 63, 64, 0, 106, 66, 67, 68, - 69, 70, 71, 72, 0, 1, 2, 0, 3, 4, - 5, 0, 73, 0, 74, 0, 0, 75, 0, 0, - 76, 0, 77, 140, 0, 329, 0, 0, 0, 0, - 0, 0, 0, 63, 64, 73, 106, 152, 153, 154, - 155, 156, 157, 72, 0, 1, 2, 0, 3, 4, - 5, 0, 0, 0, 74, 0, 0, 75, 0, 0, - 76, 0, 77, 351, 63, 64, 0, 106, 66, 67, - 68, 69, 70, 71, 72, 73, 1, 2, 0, 3, - 4, 5, 0, 0, 148, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 74, 0, 429, 75, 0, 0, - 76, 0, 77, 417, 0, 0, 73, 0, 0, 0, - 0, 0, 0, 0, 74, 0, 0, 75, 0, 0, - 76, 0, 77, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 74, 0, 0, - 75, 0, 0, 76, 0, 77, 63, 64, 0, 106, - 66, 67, 68, 69, 70, 71, 72, 0, 1, 2, - 0, 3, 4, 5, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 74, 514, 0, - 75, 0, 346, 76, 0, 77, 63, 64, 73, 65, - 66, 67, 68, 69, 70, 71, 72, 0, 1, 2, - 0, 3, 4, 5, 0, 0, 0, 0, 74, 0, - 0, 75, 0, 0, 76, 0, 77, 63, 64, 0, - 106, 152, 153, 154, 155, 156, 157, 72, 73, 1, - 2, 0, 3, 4, 5, 63, 64, 0, 147, 66, + 366, 367, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 63, 64, 368, 106, 66, 67, 68, 69, 70, 71, 72, 0, 1, 2, 0, - 3, 4, 5, 0, 0, 0, 0, 63, 64, 73, - 106, 66, 67, 68, 69, 70, 71, 72, 0, 1, - 2, 0, 3, 4, 5, 0, 0, 73, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 74, 0, 0, 75, 0, 0, 76, 0, 77, 73, - 63, 64, 0, 266, 66, 67, 68, 69, 70, 71, - 72, 0, 1, 2, 0, 3, 4, 5, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 74, 0, 0, 75, 0, 0, 76, 0, 77, 0, - 0, 0, 73, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 74, 0, 0, 75, 0, 0, 76, 0, 77, + 3, 4, 5, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 247, 248, + 0, 0, 0, 0, 0, 63, 64, 73, 106, 152, + 153, 154, 155, 156, 157, 72, 0, 1, 2, 0, + 3, 4, 5, 0, 0, 249, 197, 198, 199, 200, + 201, 202, 203, 204, 205, 206, 207, 208, 0, 250, + 0, 251, 252, 253, 0, 63, 64, 73, 106, 152, + 153, 154, 155, 156, 157, 72, 0, 1, 2, 0, + 3, 4, 5, 0, 0, 63, 64, 369, 106, 66, + 67, 68, 69, 70, 71, 72, 0, 1, 2, 0, + 3, 4, 5, 0, 0, 0, 0, 73, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 133, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 73, 0, 74, + 0, 0, 75, 0, 0, 76, 0, 77, 140, 63, + 64, 0, 147, 66, 67, 68, 69, 70, 71, 72, + 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, - 0, 0, 75, 0, 0, 76, 0, 77, 0, 0, + 0, 0, 75, 0, 0, 76, 0, 77, 351, 63, + 64, 73, 106, 66, 67, 68, 69, 70, 71, 72, + 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, + 0, 329, 75, 0, 0, 76, 0, 77, 417, 0, + 0, 73, 0, 0, 0, 0, 0, 0, 0, 74, + 0, 0, 75, 0, 0, 76, 0, 77, 0, 63, + 64, 0, 106, 152, 153, 154, 155, 156, 157, 72, + 0, 1, 2, 148, 3, 4, 5, 0, 63, 64, + 0, 106, 66, 67, 68, 69, 70, 71, 72, 0, + 1, 2, 0, 3, 4, 5, 0, 0, 0, 0, + 0, 73, 0, 74, 0, 0, 75, 0, 0, 76, + 429, 77, 0, 0, 0, 0, 0, 0, 63, 64, + 73, 106, 66, 67, 68, 69, 70, 71, 72, 0, + 1, 2, 0, 3, 4, 5, 0, 0, 0, 0, + 0, 0, 0, 74, 0, 0, 75, 0, 0, 76, + 514, 77, 0, 0, 0, 0, 0, 0, 63, 64, + 73, 65, 66, 67, 68, 69, 70, 71, 72, 0, + 1, 2, 0, 3, 4, 5, 63, 64, 0, 106, + 152, 153, 154, 155, 156, 157, 72, 0, 1, 2, + 0, 3, 4, 5, 0, 0, 0, 0, 0, 0, + 73, 0, 0, 74, 0, 0, 75, 0, 346, 76, + 0, 77, 0, 0, 0, 0, 0, 0, 73, 0, + 0, 0, 74, 0, 0, 75, 0, 0, 76, 0, + 77, 63, 64, 0, 147, 66, 67, 68, 69, 70, + 71, 72, 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 74, 0, 0, 75, 0, 0, 76, 0, 77, - 0, 63, 64, 0, 106, 152, 153, 154, 155, 156, - 157, 72, 0, 1, 2, 0, 3, 4, 5, 0, + 0, 0, 74, 0, 0, 75, 0, 0, 76, 0, + 77, 63, 64, 73, 106, 66, 67, 68, 69, 70, + 71, 72, 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 74, 0, 0, 75, 0, 0, - 76, 0, 77, 73, 63, 64, 0, 106, 66, 67, - 68, 69, 70, 71, 520, 0, 1, 2, 0, 3, - 4, 5, 63, 64, 0, 106, 66, 67, 68, 69, - 70, 71, 572, 0, 1, 2, 0, 3, 4, 5, - 167, 0, 0, 0, 0, 0, 73, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 168, - 169, 0, 0, 0, 73, 0, 0, 0, 0, 0, + 0, 0, 74, 0, 0, 75, 0, 0, 76, 0, + 77, 0, 0, 73, 0, 0, 0, 0, 0, 0, + 74, 0, 0, 75, 0, 0, 76, 0, 77, 63, + 64, 0, 266, 66, 67, 68, 69, 70, 71, 72, + 0, 1, 2, 0, 3, 4, 5, 63, 64, 0, + 106, 152, 153, 154, 155, 156, 157, 72, 0, 1, + 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, + 0, 73, 0, 0, 0, 74, 0, 0, 75, 0, + 0, 76, 0, 77, 0, 0, 0, 63, 64, 73, + 106, 66, 67, 68, 69, 70, 71, 520, 0, 1, + 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 74, 0, 0, 75, 0, + 0, 76, 0, 77, 0, 0, 0, 63, 64, 73, + 106, 66, 67, 68, 69, 70, 71, 574, 0, 1, + 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 73, + 167, 0, 0, 74, 0, 0, 75, 0, 0, 76, + 0, 77, 0, 0, 0, 0, 0, 0, 0, 168, + 169, 74, 0, 0, 75, 0, 0, 76, 0, 349, 0, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 74, 0, 0, 75, 0, - 0, 76, 0, 349, 193, 194, 195, 0, 0, 196, + 0, 74, 0, 0, 75, 0, 0, 76, 0, 77, + 0, 0, 0, 0, 193, 194, 195, 0, 0, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, - 207, 208, 209, 210, 211, 212, 213, 214, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 74, 0, - 0, 75, 0, 0, 76, 0, 77, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 74, 0, 0, 75, - 0, 0, 76, 0, 77 + 207, 208, 209, 210, 211, 212, 213, 214, -202, 0, + 0, 74, 0, 0, 75, 0, 0, 76, 0, 77, + 0, 0, 0, 0, 0, 0, -67, 1, 2, 0, + 3, 4, 5, 0, 0, 0, 0, 0, 6, 7, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, + 0, 0, 9, 0, 0, 0, 10 }; static const yytype_int16 yycheck[] = { - 0, 27, 172, 160, 232, 126, 4, 21, 0, 430, - 303, 28, 11, 173, 11, 29, 19, 17, 11, 22, - 568, 24, 195, 34, 149, 17, 336, 337, 148, 255, - 256, 148, 117, 118, 52, 160, 584, 210, 211, 212, - 213, 214, 53, 149, 217, 11, 32, 33, 66, 134, - 135, 77, 137, 138, 160, 140, 141, 142, 119, 219, - 53, 7, 8, 57, 10, 11, 12, 13, 14, 15, - 16, 17, 34, 19, 20, 101, 22, 23, 24, 105, - 18, 150, 40, 41, 145, 111, 149, 53, 148, 47, - 116, 160, 92, 39, 515, 53, 11, 160, 149, 149, - 126, 149, 17, 49, 3, 4, 5, 6, 158, 160, - 158, 0, 138, 139, 117, 118, 142, 150, 428, 152, - 146, 112, 113, 349, 38, 158, 149, 26, 27, 550, - 551, 134, 135, 156, 137, 138, 148, 140, 141, 142, - 149, 148, 159, 369, 170, 318, 160, 156, 150, 46, - 152, 48, 273, 19, 156, 22, 22, 156, 24, 156, - 21, 159, 149, 456, 585, 586, 153, 193, 194, 195, - 196, 163, 134, 135, 136, 154, 150, 139, 152, 22, - 154, 143, 144, 209, 210, 211, 212, 213, 214, 215, - 216, 217, 485, 149, 487, 316, 22, 153, 267, 225, - 269, 270, 149, 272, 22, 151, 153, 20, 154, 235, - 23, 157, 152, 159, 387, 37, 389, 390, 391, 4, - 134, 135, 136, 113, 114, 139, 42, 43, 44, 143, - 144, 47, 3, 4, 5, 6, 305, 4, 7, 8, - 150, 534, 152, 153, 313, 314, 35, 273, 37, 477, - 19, 20, 155, 22, 23, 24, 149, 150, 284, 152, - 155, 418, 149, 150, 4, 152, 42, 43, 44, 45, - 46, 47, 48, 22, 50, 301, 150, 149, 152, 153, - 341, 342, 343, 344, 345, 145, 146, 147, 83, 84, - 316, 317, 318, 354, 355, 356, 134, 135, 136, 153, - 150, 139, 152, 158, 153, 143, 144, 152, 377, 378, - 379, 42, 9, 44, 9, 488, 385, 9, 491, 492, - 493, 9, 0, 349, 9, 553, 395, 396, 556, 9, - 55, 158, 11, 359, 60, 61, 62, 63, 64, 65, - 18, 19, 20, 152, 22, 23, 24, 408, 409, 418, - 152, 152, 30, 31, 415, 152, 152, 22, 152, 152, - 152, 387, 388, 389, 390, 391, 149, 149, 394, 145, - 146, 147, 441, 51, 443, 152, 54, 446, 38, 549, - 58, 407, 38, 452, 453, 149, 149, 149, 149, 149, - 269, 270, 59, 272, 152, 152, 149, 149, 154, 569, - 38, 462, 463, 464, 465, 149, 149, 149, 469, 470, - 149, 480, 481, 149, 483, 484, 149, 149, 22, 149, - 489, 158, 149, 4, 153, 149, 305, 22, 17, 17, - 499, 457, 152, 149, 313, 314, 149, 4, 149, 149, - 501, 502, 149, 149, 149, 471, 149, 149, 152, 149, - 476, 520, 521, 149, 53, 149, 482, 158, 149, 22, - 529, 154, 488, 153, 0, 491, 492, 493, 149, 153, - 496, 153, 149, 149, 53, 475, 537, 17, 539, 540, - 153, 156, 18, 19, 20, 153, 22, 23, 24, 153, - 156, 153, 153, 4, 30, 31, 149, 566, 377, 378, - 379, 17, 17, 572, 573, 149, 385, 26, 27, 17, - 71, 17, 129, 129, 129, 51, 395, 396, 54, 247, - 544, 92, 58, 592, 593, 248, 552, 516, 597, 111, - 105, 600, 17, 7, 8, 89, 10, 11, 12, 13, - 14, 15, 16, 17, 544, 19, 20, 56, 22, 23, - 24, 90, 91, 92, 93, 94, 95, 96, 97, 98, - 99, 235, 441, 496, 443, -1, 225, 446, 410, -1, - -1, -1, -1, 452, 453, 49, -1, 96, 97, 98, - 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, - 109, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 480, 481, -1, 483, 484, -1, -1, -1, -1, - 489, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 499, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 520, 521, -1, -1, -1, -1, -1, -1, -1, - 529, -1, 3, 4, -1, -1, 7, 8, 9, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 19, 20, - -1, 22, 23, 24, 25, 26, 27, 151, -1, -1, - 154, -1, -1, 157, -1, 159, 160, 566, -1, 40, - 41, -1, -1, 572, 573, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 57, -1, -1, -1, - -1, -1, -1, 592, 593, -1, -1, -1, 597, -1, - -1, 600, 73, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 86, 87, 88, 89, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 115, 116, 117, 118, 119, 120, - 121, 122, 123, 124, 125, 126, 127, -1, 129, -1, - 131, 132, 133, -1, -1, -1, -1, -1, 3, 4, - -1, -1, 7, 8, 9, -1, -1, -1, -1, 150, - -1, 152, -1, -1, 19, 20, 157, 22, 23, 24, - 25, 26, 27, -1, -1, 7, 8, -1, -1, -1, - -1, -1, -1, -1, -1, 40, 41, 19, 20, -1, - 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, - -1, -1, 57, -1, -1, -1, -1, -1, 40, 41, - -1, -1, -1, -1, -1, -1, -1, -1, 73, 74, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, -1, -1, -1, -1, -1, - -1, 73, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, 89, -1, -1, - 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, -1, 129, -1, 131, 132, 133, -1, - -1, -1, -1, 115, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 126, 127, -1, 129, -1, 131, - 132, 133, 157, -1, -1, -1, -1, -1, 3, 4, - -1, -1, -1, -1, 9, -1, -1, -1, 150, -1, - 152, -1, 154, -1, -1, 157, -1, 159, -1, 161, - 25, 26, 27, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 40, 41, -1, -1, -1, + 0, 27, 172, 232, 160, 4, 126, 11, 150, 195, + 28, 303, 430, 11, 34, 0, 173, 17, 160, 11, + 255, 256, 11, 568, 210, 211, 212, 213, 214, 336, + 337, 217, 17, 53, 21, 52, 46, 34, 48, 40, + 41, 586, 29, 149, 149, 149, 47, 0, 149, 66, + 149, 77, 53, 148, 160, 160, 160, 156, 148, 160, + 119, 53, 219, 149, 53, 18, 19, 20, 11, 22, + 23, 24, 158, 149, 17, 101, 149, 30, 31, 105, + 153, 150, 158, 152, 149, 111, 145, 32, 33, 158, + 116, 156, 92, 150, 35, 152, 37, 515, 51, 156, + 126, 54, 520, 521, 18, 58, 42, 43, 44, 57, + 38, 47, 138, 139, 349, 150, 142, 152, 153, 19, + 146, 428, 22, 20, 24, 267, 23, 269, 270, 150, + 272, 152, 318, 154, 369, 0, 149, 134, 135, 136, + 153, 159, 139, 150, 170, 152, 143, 144, 3, 4, + 5, 6, 156, 273, 572, 573, 574, 575, 156, 154, + 159, 149, 148, 305, 456, 153, 148, 193, 194, 195, + 196, 313, 314, 160, 113, 114, 594, 595, 163, 149, + 150, 148, 152, 209, 210, 211, 212, 213, 214, 215, + 216, 217, 42, 485, 44, 487, 316, 149, 150, 225, + 152, 387, 22, 389, 390, 391, 134, 135, 136, 235, + 150, 139, 152, 153, 21, 143, 144, 3, 4, 5, + 6, 145, 146, 147, 22, 42, 43, 44, 45, 46, + 47, 48, 150, 50, 152, 377, 378, 379, 112, 113, + 26, 27, 534, 385, 7, 8, 22, 273, 477, 117, + 118, 83, 84, 395, 396, 22, 19, 20, 284, 22, + 23, 24, 418, 152, 4, 4, 134, 135, 37, 137, + 138, 155, 140, 141, 142, 301, 418, 155, 4, 22, + 149, 153, 341, 342, 343, 344, 345, 158, 9, 153, + 316, 317, 318, 152, 9, 354, 355, 356, 9, 441, + 9, 443, 488, 9, 446, 491, 492, 493, 9, 55, + 452, 453, 11, 158, 152, 152, 152, 19, 152, 152, + 22, 152, 24, 349, 553, 22, 152, 556, 145, 146, + 147, 152, 59, 359, 149, 134, 135, 136, 480, 481, + 139, 483, 484, 152, 143, 144, 149, 489, 149, 408, + 409, 38, 149, 149, 149, 149, 415, 499, 38, 152, + 152, 387, 388, 389, 390, 391, 149, 149, 394, 60, + 61, 62, 63, 64, 65, 154, 149, 269, 270, 549, + 272, 407, 38, 149, 149, 7, 8, 529, 10, 11, + 12, 13, 14, 15, 16, 17, 149, 19, 20, 569, + 22, 23, 24, 462, 463, 464, 465, 149, 550, 551, + 469, 470, 149, 305, 149, 117, 118, 158, 149, 149, + 22, 313, 314, 4, 566, 149, 22, 49, 153, 17, + 17, 457, 134, 135, 152, 137, 138, 149, 140, 141, + 142, 149, 501, 502, 4, 471, 149, 589, 590, 149, + 476, 149, 53, 149, 596, 597, 482, 149, 152, 149, + 149, 603, 488, 149, 606, 491, 492, 493, 149, 153, + 496, 149, 149, 158, 149, 475, 149, 153, 537, 153, + 539, 540, 22, 149, 154, 377, 378, 379, 156, 153, + 153, 53, 17, 385, 156, 153, 3, 4, 153, 153, + 7, 8, 9, 395, 396, 4, 152, 152, 149, 17, + 149, 17, 19, 20, 17, 22, 23, 24, 25, 26, + 27, 71, 17, 129, 129, 129, 552, 247, 544, 151, + 225, 248, 154, 40, 41, 157, 92, 159, 160, 516, + 111, 105, 235, 17, 544, 89, 56, 496, 410, 441, + 57, 443, -1, -1, 446, -1, -1, -1, -1, -1, + 452, 453, -1, -1, -1, -1, 73, 74, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, -1, -1, -1, -1, -1, 480, 481, + -1, 483, 484, -1, -1, -1, -1, 489, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 499, 115, 116, + 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, + 127, -1, 129, -1, 131, 132, 133, 134, 135, -1, + 137, 138, -1, 140, 141, 142, -1, 529, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 3, 4, -1, + 157, 7, 8, 9, -1, -1, -1, -1, 550, 551, + -1, -1, -1, 19, 20, -1, 22, 23, 24, 25, + 26, 27, 26, 27, 566, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 40, 41, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, -1, 589, 590, -1, + -1, 57, -1, -1, 596, 597, -1, -1, -1, -1, + -1, 603, -1, -1, 606, -1, -1, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + 86, 87, 88, 89, -1, -1, -1, -1, -1, -1, + -1, -1, 96, 97, 98, 99, 100, 101, 102, 103, + 104, 105, 106, 107, 108, 109, -1, -1, -1, 115, + 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, + 126, 127, -1, 129, -1, 131, 132, 133, -1, -1, + -1, -1, -1, 3, 4, -1, -1, 7, 8, 9, + -1, -1, -1, -1, 150, -1, 152, -1, -1, 19, + 20, 157, 22, 23, 24, 25, 26, 27, -1, -1, + 7, 8, -1, -1, -1, -1, -1, -1, -1, -1, + 40, 41, 19, 20, -1, 22, 23, 24, 25, -1, + -1, -1, -1, -1, -1, -1, -1, 57, -1, -1, + -1, -1, -1, 40, 41, -1, -1, -1, -1, -1, + -1, -1, -1, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + -1, -1, -1, -1, -1, -1, 73, 74, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, -1, -1, 115, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 126, 127, -1, 129, + -1, 131, 132, 133, -1, -1, -1, -1, 115, 116, + 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, + 127, -1, 129, -1, 131, 132, 133, 157, -1, -1, + -1, -1, -1, 3, 4, -1, -1, -1, -1, 9, + -1, -1, -1, 150, -1, 152, -1, 154, -1, -1, + 157, -1, 159, -1, 161, 25, 26, 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 7, 8, 57, 10, 11, 12, 13, 14, 15, 16, - 17, -1, 19, 20, -1, 22, 23, 24, 73, 74, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, -1, -1, -1, -1, -1, - 7, 8, 49, 10, 11, 12, 13, 14, 15, 16, - 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, - 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, -1, 129, -1, 131, 132, 133, -1, - 7, 8, 49, 10, 11, 12, 13, 14, 15, 16, - 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, - 7, 8, 157, 10, 11, 12, 13, 14, 15, 16, - 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, - -1, -1, 49, 7, 8, -1, 10, 11, 12, 13, - 14, 15, 16, 17, -1, 19, 20, -1, 22, 23, - 24, -1, 49, -1, 151, -1, -1, 154, -1, -1, - 157, -1, 159, 160, -1, 39, -1, -1, -1, -1, - -1, -1, -1, 7, 8, 49, 10, 11, 12, 13, - 14, 15, 16, 17, -1, 19, 20, -1, 22, 23, - 24, -1, -1, -1, 151, -1, -1, 154, -1, -1, - 157, -1, 159, 160, 7, 8, -1, 10, 11, 12, - 13, 14, 15, 16, 17, 49, 19, 20, -1, 22, - 23, 24, -1, -1, 121, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 151, -1, 39, 154, -1, -1, - 157, -1, 159, 160, -1, -1, 49, -1, -1, -1, - -1, -1, -1, -1, 151, -1, -1, 154, -1, -1, - 157, -1, 159, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 151, -1, -1, - 154, -1, -1, 157, -1, 159, 7, 8, -1, 10, - 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, - -1, 22, 23, 24, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 151, 39, -1, - 154, -1, 156, 157, -1, 159, 7, 8, 49, 10, - 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, - -1, 22, 23, 24, -1, -1, -1, -1, 151, -1, - -1, 154, -1, -1, 157, -1, 159, 7, 8, -1, - 10, 11, 12, 13, 14, 15, 16, 17, 49, 19, - 20, -1, 22, 23, 24, 7, 8, -1, 10, 11, + 40, 41, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 7, 8, 57, 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, - 22, 23, 24, -1, -1, -1, -1, 7, 8, 49, - 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, - 20, -1, 22, 23, 24, -1, -1, 49, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 151, -1, -1, 154, -1, -1, 157, -1, 159, 49, - 7, 8, -1, 10, 11, 12, 13, 14, 15, 16, - 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 151, -1, -1, 154, -1, -1, 157, -1, 159, -1, - -1, -1, 49, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 151, -1, -1, 154, -1, -1, 157, -1, 159, + 22, 23, 24, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + -1, -1, -1, -1, -1, 7, 8, 49, 10, 11, + 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, + 22, 23, 24, -1, -1, 115, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 126, 127, -1, 129, + -1, 131, 132, 133, -1, 7, 8, 49, 10, 11, + 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, + 22, 23, 24, -1, -1, 7, 8, 157, 10, 11, + 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, + 22, 23, 24, -1, -1, -1, -1, 49, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 39, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 49, -1, 151, + -1, -1, 154, -1, -1, 157, -1, 159, 160, 7, + 8, -1, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 151, - -1, -1, 154, -1, -1, 157, -1, 159, -1, -1, + -1, -1, 154, -1, -1, 157, -1, 159, 160, 7, + 8, 49, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 151, + -1, 39, 154, -1, -1, 157, -1, 159, 160, -1, + -1, 49, -1, -1, -1, -1, -1, -1, -1, 151, + -1, -1, 154, -1, -1, 157, -1, 159, -1, 7, + 8, -1, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, 121, 22, 23, 24, -1, 7, 8, + -1, 10, 11, 12, 13, 14, 15, 16, 17, -1, + 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, + -1, 49, -1, 151, -1, -1, 154, -1, -1, 157, + 39, 159, -1, -1, -1, -1, -1, -1, 7, 8, + 49, 10, 11, 12, 13, 14, 15, 16, 17, -1, + 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, + -1, -1, -1, 151, -1, -1, 154, -1, -1, 157, + 39, 159, -1, -1, -1, -1, -1, -1, 7, 8, + 49, 10, 11, 12, 13, 14, 15, 16, 17, -1, + 19, 20, -1, 22, 23, 24, 7, 8, -1, 10, + 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, + -1, 22, 23, 24, -1, -1, -1, -1, -1, -1, + 49, -1, -1, 151, -1, -1, 154, -1, 156, 157, + -1, 159, -1, -1, -1, -1, -1, -1, 49, -1, + -1, -1, 151, -1, -1, 154, -1, -1, 157, -1, + 159, 7, 8, -1, 10, 11, 12, 13, 14, 15, + 16, 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 151, -1, -1, 154, -1, -1, 157, -1, 159, - -1, 7, 8, -1, 10, 11, 12, 13, 14, 15, + -1, -1, 151, -1, -1, 154, -1, -1, 157, -1, + 159, 7, 8, 49, 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 151, -1, -1, 154, -1, -1, - 157, -1, 159, 49, 7, 8, -1, 10, 11, 12, - 13, 14, 15, 16, 17, -1, 19, 20, -1, 22, - 23, 24, 7, 8, -1, 10, 11, 12, 13, 14, - 15, 16, 17, -1, 19, 20, -1, 22, 23, 24, - 36, -1, -1, -1, -1, -1, 49, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 55, - 56, -1, -1, -1, 49, -1, -1, -1, -1, -1, + -1, -1, 151, -1, -1, 154, -1, -1, 157, -1, + 159, -1, -1, 49, -1, -1, -1, -1, -1, -1, + 151, -1, -1, 154, -1, -1, 157, -1, 159, 7, + 8, -1, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, -1, 22, 23, 24, 7, 8, -1, + 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, + 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, + -1, 49, -1, -1, -1, 151, -1, -1, 154, -1, + -1, 157, -1, 159, -1, -1, -1, 7, 8, 49, + 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, + 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 151, -1, -1, 154, -1, + -1, 157, -1, 159, -1, -1, -1, 7, 8, 49, + 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, + 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 49, + 36, -1, -1, 151, -1, -1, 154, -1, -1, 157, + -1, 159, -1, -1, -1, -1, -1, -1, -1, 55, + 56, 151, -1, -1, 154, -1, -1, 157, -1, 159, -1, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 151, -1, -1, 154, -1, - -1, 157, -1, 159, 110, 111, 112, -1, -1, 115, + -1, 151, -1, -1, 154, -1, -1, 157, -1, 159, + -1, -1, -1, -1, 110, 111, 112, -1, -1, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 131, 132, 133, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 151, -1, - -1, 154, -1, -1, 157, -1, 159, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 151, -1, -1, 154, - -1, -1, 157, -1, 159 + 126, 127, 128, 129, 130, 131, 132, 133, 0, -1, + -1, 151, -1, -1, 154, -1, -1, 157, -1, 159, + -1, -1, -1, -1, -1, -1, 18, 19, 20, -1, + 22, 23, 24, -1, -1, -1, -1, -1, 30, 31, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 51, + -1, -1, 54, -1, -1, -1, 58 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -2605,12 +2595,12 @@ static const yytype_uint8 yystos[] = 17, 194, 238, 229, 229, 188, 188, 230, 229, 149, 230, 230, 230, 238, 229, 200, 200, 149, 153, 149, 149, 153, 153, 153, 184, 189, 190, 22, 149, 154, - 229, 229, 149, 153, 156, 229, 153, 188, 153, 153, + 184, 184, 149, 153, 156, 229, 153, 188, 153, 153, 200, 200, 200, 171, 53, 187, 17, 156, 168, 235, - 184, 184, 17, 194, 186, 156, 186, 153, 153, 153, - 4, 229, 227, 156, 168, 229, 229, 38, 149, 227, - 184, 184, 17, 17, 149, 229, 229, 17, 71, 229, - 17, 229 + 117, 118, 229, 229, 17, 194, 186, 156, 186, 153, + 153, 153, 4, 229, 227, 156, 168, 184, 184, 184, + 184, 38, 149, 227, 229, 229, 17, 17, 149, 184, + 184, 229, 229, 17, 71, 229, 17, 229 }; #define yyerrok (yyerrstatus = 0) @@ -2684,7 +2674,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL +# if YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -3425,142 +3415,142 @@ yyreduce: switch (yyn) { case 29: -#line 1134 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1111 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;} break; case 30: -#line 1134 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1111 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;} break; case 31: -#line 1135 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1112 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;} break; case 32: -#line 1135 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1112 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;} break; case 33: -#line 1136 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1113 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;} break; case 34: -#line 1136 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1113 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;} break; case 35: -#line 1137 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1114 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;} break; case 36: -#line 1137 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1114 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;} break; case 37: -#line 1138 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1115 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;} break; case 38: -#line 1138 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1115 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;} break; case 39: -#line 1142 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1119 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;} break; case 40: -#line 1142 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1119 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;} break; case 41: -#line 1143 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1120 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;} break; case 42: -#line 1143 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1120 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;} break; case 43: -#line 1144 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1121 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;} break; case 44: -#line 1144 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1121 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;} break; case 45: -#line 1145 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1122 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;} break; case 46: -#line 1145 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1122 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;} break; case 47: -#line 1146 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1123 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;} break; case 48: -#line 1146 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1123 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;} break; case 49: -#line 1147 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1124 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;} break; case 50: -#line 1147 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1124 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;} break; case 51: -#line 1148 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1125 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;} break; case 52: -#line 1148 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1125 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;} break; case 53: -#line 1149 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1126 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;} break; case 54: -#line 1150 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1127 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;} break; case 65: -#line 1159 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1136 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; ;} break; case 66: -#line 1163 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1140 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal); CHECK_FOR_ERROR @@ -3568,7 +3558,7 @@ yyreduce: break; case 67: -#line 1167 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1144 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; CHECK_FOR_ERROR @@ -3576,7 +3566,7 @@ yyreduce: break; case 71: -#line 1175 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1152 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; CHECK_FOR_ERROR @@ -3584,7 +3574,7 @@ yyreduce: break; case 72: -#line 1180 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1157 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal); CHECK_FOR_ERROR @@ -3592,152 +3582,152 @@ yyreduce: break; case 73: -#line 1186 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1163 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::InternalLinkage; ;} break; case 74: -#line 1187 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1164 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::WeakLinkage; ;} break; case 75: -#line 1188 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1165 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;} break; case 76: -#line 1189 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1166 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;} break; case 77: -#line 1190 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1167 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;} break; case 78: -#line 1194 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1171 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;} break; case 79: -#line 1195 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1172 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;} break; case 80: -#line 1196 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1173 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} break; case 81: -#line 1200 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1177 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Visibility) = GlobalValue::DefaultVisibility; ;} break; case 82: -#line 1201 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1178 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Visibility) = GlobalValue::DefaultVisibility; ;} break; case 83: -#line 1202 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1179 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Visibility) = GlobalValue::HiddenVisibility; ;} break; case 84: -#line 1203 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1180 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Visibility) = GlobalValue::ProtectedVisibility; ;} break; case 85: -#line 1207 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1184 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} break; case 86: -#line 1208 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1185 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;} break; case 87: -#line 1209 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1186 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;} break; case 88: -#line 1213 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1190 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} break; case 89: -#line 1214 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1191 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::InternalLinkage; ;} break; case 90: -#line 1215 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1192 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;} break; case 91: -#line 1216 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1193 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::WeakLinkage; ;} break; case 92: -#line 1217 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1194 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;} break; case 93: -#line 1221 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1198 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} break; case 94: -#line 1222 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1199 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::WeakLinkage; ;} break; case 95: -#line 1223 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1200 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::InternalLinkage; ;} break; case 96: -#line 1226 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1203 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::C; ;} break; case 97: -#line 1227 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1204 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::C; ;} break; case 98: -#line 1228 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1205 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::Fast; ;} break; case 99: -#line 1229 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1206 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::Cold; ;} break; case 100: -#line 1230 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1207 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::X86_StdCall; ;} break; case 101: -#line 1231 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1208 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::X86_FastCall; ;} break; case 102: -#line 1232 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1209 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val)) GEN_ERROR("Calling conv too large"); @@ -3747,111 +3737,111 @@ yyreduce: break; case 103: -#line 1239 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1216 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::ZExt; ;} break; case 104: -#line 1240 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1217 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::ZExt; ;} break; case 105: -#line 1241 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1218 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::SExt; ;} break; case 106: -#line 1242 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1219 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::SExt; ;} break; case 107: -#line 1243 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1220 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::InReg; ;} break; case 108: -#line 1244 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1221 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::StructRet; ;} break; case 109: -#line 1245 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1222 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::NoAlias; ;} break; case 110: -#line 1246 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1223 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::ByVal; ;} break; case 111: -#line 1247 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1224 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::Nest; ;} break; case 112: -#line 1250 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1227 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::None; ;} break; case 113: -#line 1251 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1228 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs); ;} break; case 114: -#line 1256 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1233 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::NoReturn; ;} break; case 115: -#line 1257 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1234 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::NoUnwind; ;} break; case 116: -#line 1258 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1235 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::ZExt; ;} break; case 117: -#line 1259 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1236 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::SExt; ;} break; case 118: -#line 1260 "/llvm/lib/AsmParser/llvmAsmParser.y" - { (yyval.ParamAttrs) = ParamAttr::Pure; ;} +#line 1237 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::ReadNone; ;} break; case 119: -#line 1261 "/llvm/lib/AsmParser/llvmAsmParser.y" - { (yyval.ParamAttrs) = ParamAttr::Const; ;} +#line 1238 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::ReadOnly; ;} break; case 120: -#line 1264 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1241 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::None; ;} break; case 121: -#line 1265 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1242 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs); ;} break; case 122: -#line 1272 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1249 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = 0; ;} break; case 123: -#line 1273 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1250 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val); if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal))) @@ -3861,12 +3851,12 @@ yyreduce: break; case 124: -#line 1279 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1256 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = 0; ;} break; case 125: -#line 1280 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1257 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val); if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal))) @@ -3876,7 +3866,7 @@ yyreduce: break; case 126: -#line 1288 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1265 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { for (unsigned i = 0, e = (yyvsp[(2) - (2)].StrVal)->length(); i != e; ++i) if ((*(yyvsp[(2) - (2)].StrVal))[i] == '"' || (*(yyvsp[(2) - (2)].StrVal))[i] == '\\') @@ -3887,27 +3877,27 @@ yyreduce: break; case 127: -#line 1296 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1273 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; ;} break; case 128: -#line 1297 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1274 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;} break; case 129: -#line 1302 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1279 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" {;} break; case 130: -#line 1303 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1280 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" {;} break; case 131: -#line 1304 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1281 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurGV->setSection(*(yyvsp[(1) - (1)].StrVal)); delete (yyvsp[(1) - (1)].StrVal); @@ -3916,7 +3906,7 @@ yyreduce: break; case 132: -#line 1309 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1286 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(2) - (2)].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[(2) - (2)].UInt64Val))) GEN_ERROR("Alignment must be a power of two"); @@ -3926,7 +3916,7 @@ yyreduce: break; case 140: -#line 1325 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1302 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeVal) = new PATypeHolder(OpaqueType::get()); CHECK_FOR_ERROR @@ -3934,7 +3924,7 @@ yyreduce: break; case 141: -#line 1329 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1306 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeVal) = new PATypeHolder((yyvsp[(1) - (1)].PrimType)); CHECK_FOR_ERROR @@ -3942,7 +3932,7 @@ yyreduce: break; case 142: -#line 1333 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1310 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Pointer type? if (*(yyvsp[(1) - (2)].TypeVal) == Type::LabelTy) GEN_ERROR("Cannot form a pointer to a basic block"); @@ -3953,7 +3943,7 @@ yyreduce: break; case 143: -#line 1340 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1317 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Named types are also simple types... const Type* tmp = getTypeVal((yyvsp[(1) - (1)].ValIDVal)); CHECK_FOR_ERROR @@ -3962,7 +3952,7 @@ yyreduce: break; case 144: -#line 1345 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1322 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Type UpReference if ((yyvsp[(2) - (2)].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range"); OpaqueType *OT = OpaqueType::get(); // Use temporary placeholder @@ -3974,32 +3964,20 @@ yyreduce: break; case 145: -#line 1353 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1330 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. std::vector Params; - ParamAttrsVector Attrs; - if ((yyvsp[(5) - (5)].ParamAttrs) != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = 0; X.attrs = (yyvsp[(5) - (5)].ParamAttrs); - Attrs.push_back(X); - } - unsigned index = 1; TypeWithAttrsList::iterator I = (yyvsp[(3) - (5)].TypeWithAttrsList)->begin(), E = (yyvsp[(3) - (5)].TypeWithAttrsList)->end(); - for (; I != E; ++I, ++index) { + for (; I != E; ++I ) { const Type *Ty = I->Ty->get(); Params.push_back(Ty); - if (Ty != Type::VoidTy) - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = index; X.attrs = I->Attrs; - Attrs.push_back(X); - } } bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); - ParamAttrsList *ActualAttrs = 0; - if (!Attrs.empty()) - ActualAttrs = ParamAttrsList::get(Attrs); - FunctionType *FT = FunctionType::get(*(yyvsp[(1) - (5)].TypeVal), Params, isVarArg, ActualAttrs); + FunctionType *FT = FunctionType::get(*(yyvsp[(1) - (5)].TypeVal), Params, isVarArg); delete (yyvsp[(3) - (5)].TypeWithAttrsList); // Delete the argument list delete (yyvsp[(1) - (5)].TypeVal); // Delete the return type handle (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT)); @@ -4008,33 +3986,20 @@ yyreduce: break; case 146: -#line 1383 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1348 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. std::vector Params; - ParamAttrsVector Attrs; - if ((yyvsp[(5) - (5)].ParamAttrs) != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = 0; X.attrs = (yyvsp[(5) - (5)].ParamAttrs); - Attrs.push_back(X); - } TypeWithAttrsList::iterator I = (yyvsp[(3) - (5)].TypeWithAttrsList)->begin(), E = (yyvsp[(3) - (5)].TypeWithAttrsList)->end(); - unsigned index = 1; - for ( ; I != E; ++I, ++index) { + for ( ; I != E; ++I ) { const Type* Ty = I->Ty->get(); Params.push_back(Ty); - if (Ty != Type::VoidTy) - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = index; X.attrs = I->Attrs; - Attrs.push_back(X); - } } bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); - ParamAttrsList *ActualAttrs = 0; - if (!Attrs.empty()) - ActualAttrs = ParamAttrsList::get(Attrs); - - FunctionType *FT = FunctionType::get((yyvsp[(1) - (5)].PrimType), Params, isVarArg, ActualAttrs); + FunctionType *FT = FunctionType::get((yyvsp[(1) - (5)].PrimType), Params, isVarArg); delete (yyvsp[(3) - (5)].TypeWithAttrsList); // Delete the argument list (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT)); CHECK_FOR_ERROR @@ -4042,7 +4007,7 @@ yyreduce: break; case 147: -#line 1414 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1366 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Sized array type? (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[(4) - (5)].TypeVal), (unsigned)(yyvsp[(2) - (5)].UInt64Val)))); delete (yyvsp[(4) - (5)].TypeVal); @@ -4051,7 +4016,7 @@ yyreduce: break; case 148: -#line 1419 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1371 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Vector type? const llvm::Type* ElemTy = (yyvsp[(4) - (5)].TypeVal)->get(); if ((unsigned)(yyvsp[(2) - (5)].UInt64Val) != (yyvsp[(2) - (5)].UInt64Val)) @@ -4065,7 +4030,7 @@ yyreduce: break; case 149: -#line 1429 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1381 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Structure type? std::vector Elements; for (std::list::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(), @@ -4079,7 +4044,7 @@ yyreduce: break; case 150: -#line 1439 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1391 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Empty structure type? (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector())); CHECK_FOR_ERROR @@ -4087,7 +4052,7 @@ yyreduce: break; case 151: -#line 1443 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1395 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { std::vector Elements; for (std::list::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(), @@ -4101,7 +4066,7 @@ yyreduce: break; case 152: -#line 1453 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1405 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Empty structure type? (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector(), true)); CHECK_FOR_ERROR @@ -4109,15 +4074,17 @@ yyreduce: break; case 153: -#line 1460 "/llvm/lib/AsmParser/llvmAsmParser.y" - { +#line 1412 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" + { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. (yyval.TypeWithAttrs).Ty = (yyvsp[(1) - (2)].TypeVal); - (yyval.TypeWithAttrs).Attrs = (yyvsp[(2) - (2)].ParamAttrs); + (yyval.TypeWithAttrs).Attrs = ParamAttr::None; ;} break; case 154: -#line 1467 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1421 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal))->getDescription()); @@ -4128,14 +4095,14 @@ yyreduce: break; case 155: -#line 1474 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1428 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeVal) = new PATypeHolder(Type::VoidTy); ;} break; case 156: -#line 1479 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1433 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeWithAttrsList) = new TypeWithAttrsList(); (yyval.TypeWithAttrsList)->push_back((yyvsp[(1) - (1)].TypeWithAttrs)); @@ -4144,7 +4111,7 @@ yyreduce: break; case 157: -#line 1484 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1438 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { ((yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList))->push_back((yyvsp[(3) - (3)].TypeWithAttrs)); CHECK_FOR_ERROR @@ -4152,7 +4119,7 @@ yyreduce: break; case 159: -#line 1492 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1446 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList); TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None; @@ -4163,7 +4130,7 @@ yyreduce: break; case 160: -#line 1499 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1453 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeWithAttrsList) = new TypeWithAttrsList; TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None; @@ -4174,7 +4141,7 @@ yyreduce: break; case 161: -#line 1506 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1460 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeWithAttrsList) = new TypeWithAttrsList(); CHECK_FOR_ERROR @@ -4182,7 +4149,7 @@ yyreduce: break; case 162: -#line 1514 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1468 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeList) = new std::list(); (yyval.TypeList)->push_back(*(yyvsp[(1) - (1)].TypeVal)); @@ -4192,7 +4159,7 @@ yyreduce: break; case 163: -#line 1520 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1474 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(*(yyvsp[(3) - (3)].TypeVal)); delete (yyvsp[(3) - (3)].TypeVal); @@ -4201,7 +4168,7 @@ yyreduce: break; case 164: -#line 1532 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1486 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Nonempty unsized arr if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription()); @@ -4233,7 +4200,7 @@ yyreduce: break; case 165: -#line 1560 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1514 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription()); @@ -4253,7 +4220,7 @@ yyreduce: break; case 166: -#line 1576 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1530 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription()); @@ -4284,7 +4251,7 @@ yyreduce: break; case 167: -#line 1603 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1557 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Nonempty unsized arr if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription()); @@ -4316,7 +4283,7 @@ yyreduce: break; case 168: -#line 1631 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1585 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { const StructType *STy = dyn_cast((yyvsp[(1) - (4)].TypeVal)->get()); if (STy == 0) @@ -4346,7 +4313,7 @@ yyreduce: break; case 169: -#line 1657 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1611 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription()); @@ -4370,7 +4337,7 @@ yyreduce: break; case 170: -#line 1677 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1631 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { const StructType *STy = dyn_cast((yyvsp[(1) - (6)].TypeVal)->get()); if (STy == 0) @@ -4400,7 +4367,7 @@ yyreduce: break; case 171: -#line 1703 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1657 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (5)].TypeVal))->getDescription()); @@ -4424,7 +4391,7 @@ yyreduce: break; case 172: -#line 1723 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1677 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -4440,7 +4407,7 @@ yyreduce: break; case 173: -#line 1735 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1689 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -4451,7 +4418,7 @@ yyreduce: break; case 174: -#line 1742 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1696 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -4521,7 +4488,7 @@ yyreduce: break; case 175: -#line 1808 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1762 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -4535,7 +4502,7 @@ yyreduce: break; case 176: -#line 1818 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1772 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -4549,7 +4516,7 @@ yyreduce: break; case 177: -#line 1828 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1782 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // integral constants if (!ConstantInt::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].SInt64Val))) GEN_ERROR("Constant value doesn't fit in type"); @@ -4559,7 +4526,7 @@ yyreduce: break; case 178: -#line 1834 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1788 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // arbitrary precision integer constants uint32_t BitWidth = cast((yyvsp[(1) - (2)].PrimType))->getBitWidth(); if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) { @@ -4573,7 +4540,7 @@ yyreduce: break; case 179: -#line 1844 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1798 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // integral constants if (!ConstantInt::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].UInt64Val))) GEN_ERROR("Constant value doesn't fit in type"); @@ -4583,7 +4550,7 @@ yyreduce: break; case 180: -#line 1850 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1804 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // arbitrary precision integer constants uint32_t BitWidth = cast((yyvsp[(1) - (2)].PrimType))->getBitWidth(); if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) { @@ -4597,7 +4564,7 @@ yyreduce: break; case 181: -#line 1860 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1814 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Boolean constants assert(cast((yyvsp[(1) - (2)].PrimType))->getBitWidth() == 1 && "Not Bool?"); (yyval.ConstVal) = ConstantInt::getTrue(); @@ -4606,7 +4573,7 @@ yyreduce: break; case 182: -#line 1865 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1819 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Boolean constants assert(cast((yyvsp[(1) - (2)].PrimType))->getBitWidth() == 1 && "Not Bool?"); (yyval.ConstVal) = ConstantInt::getFalse(); @@ -4615,7 +4582,7 @@ yyreduce: break; case 183: -#line 1870 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1824 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Floating point constants if (!ConstantFP::isValueValidForType((yyvsp[(1) - (2)].PrimType), *(yyvsp[(2) - (2)].FPVal))) GEN_ERROR("Floating point constant invalid for type"); @@ -4630,7 +4597,7 @@ yyreduce: break; case 184: -#line 1883 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1837 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (6)].TypeVal))->getDescription()); @@ -4646,7 +4613,7 @@ yyreduce: break; case 185: -#line 1895 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1849 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!isa((yyvsp[(3) - (5)].ConstVal)->getType())) GEN_ERROR("GetElementPtr requires a pointer operand"); @@ -4672,7 +4639,7 @@ yyreduce: break; case 186: -#line 1917 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1871 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(3) - (8)].ConstVal)->getType() != Type::Int1Ty) GEN_ERROR("Select condition must be of boolean type"); @@ -4684,7 +4651,7 @@ yyreduce: break; case 187: -#line 1925 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1879 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType()) GEN_ERROR("Binary operator types must match"); @@ -4694,7 +4661,7 @@ yyreduce: break; case 188: -#line 1931 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1885 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType()) GEN_ERROR("Logical operator types must match"); @@ -4709,7 +4676,7 @@ yyreduce: break; case 189: -#line 1942 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1896 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType()) GEN_ERROR("icmp operand types must match"); @@ -4718,7 +4685,7 @@ yyreduce: break; case 190: -#line 1947 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1901 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType()) GEN_ERROR("fcmp operand types must match"); @@ -4727,7 +4694,7 @@ yyreduce: break; case 191: -#line 1952 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1906 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal))) GEN_ERROR("Invalid extractelement operands"); @@ -4737,7 +4704,7 @@ yyreduce: break; case 192: -#line 1958 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1912 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!InsertElementInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal))) GEN_ERROR("Invalid insertelement operands"); @@ -4747,7 +4714,7 @@ yyreduce: break; case 193: -#line 1964 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1918 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!ShuffleVectorInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal))) GEN_ERROR("Invalid shufflevector operands"); @@ -4757,7 +4724,7 @@ yyreduce: break; case 194: -#line 1973 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1927 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal)); CHECK_FOR_ERROR @@ -4765,7 +4732,7 @@ yyreduce: break; case 195: -#line 1977 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1931 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ConstVector) = new std::vector(); (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal)); @@ -4774,27 +4741,27 @@ yyreduce: break; case 196: -#line 1985 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1939 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; ;} break; case 197: -#line 1985 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1939 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; ;} break; case 198: -#line 1988 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1942 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; ;} break; case 199: -#line 1988 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1942 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; ;} break; case 200: -#line 1991 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1945 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { const Type* VTy = (yyvsp[(1) - (2)].TypeVal)->get(); Value *V = getVal(VTy, (yyvsp[(2) - (2)].ValIDVal)); @@ -4810,7 +4777,7 @@ yyreduce: break; case 201: -#line 2003 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1957 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { Constant *Val = (yyvsp[(3) - (6)].ConstVal); const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get(); @@ -4826,7 +4793,7 @@ yyreduce: break; case 202: -#line 2024 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1978 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule; CurModule.ModuleDone(); @@ -4835,7 +4802,7 @@ yyreduce: break; case 203: -#line 2029 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1983 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule; CurModule.ModuleDone(); @@ -4844,12 +4811,12 @@ yyreduce: break; case 206: -#line 2042 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1996 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurFun.isDeclare = false; ;} break; case 207: -#line 2042 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1996 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurFun.FunctionDone(); CHECK_FOR_ERROR @@ -4857,26 +4824,26 @@ yyreduce: break; case 208: -#line 2046 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2000 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurFun.isDeclare = true; ;} break; case 209: -#line 2046 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2000 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; case 210: -#line 2049 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2003 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; case 211: -#line 2052 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2006 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (3)].TypeVal))->getDescription()); @@ -4904,7 +4871,7 @@ yyreduce: break; case 212: -#line 2076 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2030 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { ResolveTypeTo((yyvsp[(1) - (3)].StrVal), (yyvsp[(3) - (3)].PrimType)); @@ -4919,7 +4886,7 @@ yyreduce: break; case 213: -#line 2087 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2041 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { /* "Externally Visible" Linkage */ if ((yyvsp[(5) - (5)].ConstVal) == 0) @@ -4931,14 +4898,14 @@ yyreduce: break; case 214: -#line 2094 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2048 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurGV = 0; ;} break; case 215: -#line 2098 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2052 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(6) - (6)].ConstVal) == 0) GEN_ERROR("Global value initializer is not a constant"); @@ -4948,14 +4915,14 @@ yyreduce: break; case 216: -#line 2103 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2057 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurGV = 0; ;} break; case 217: -#line 2107 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2061 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(6) - (6)].TypeVal))->getDescription()); @@ -4966,7 +4933,7 @@ yyreduce: break; case 218: -#line 2113 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2067 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurGV = 0; CHECK_FOR_ERROR @@ -4974,7 +4941,7 @@ yyreduce: break; case 219: -#line 2117 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2071 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { std::string Name; if ((yyvsp[(1) - (5)].StrVal)) { @@ -5018,21 +4985,21 @@ yyreduce: break; case 220: -#line 2157 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2111 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; case 221: -#line 2160 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2114 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; case 222: -#line 2166 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2120 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm(); if (AsmSoFar.empty()) @@ -5045,7 +5012,7 @@ yyreduce: break; case 223: -#line 2176 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2130 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurModule.CurrentModule->setTargetTriple(*(yyvsp[(3) - (3)].StrVal)); delete (yyvsp[(3) - (3)].StrVal); @@ -5053,7 +5020,7 @@ yyreduce: break; case 224: -#line 2180 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2134 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurModule.CurrentModule->setDataLayout(*(yyvsp[(3) - (3)].StrVal)); delete (yyvsp[(3) - (3)].StrVal); @@ -5061,7 +5028,7 @@ yyreduce: break; case 226: -#line 2187 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2141 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurModule.CurrentModule->addLibrary(*(yyvsp[(3) - (3)].StrVal)); delete (yyvsp[(3) - (3)].StrVal); @@ -5070,7 +5037,7 @@ yyreduce: break; case 227: -#line 2192 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2146 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurModule.CurrentModule->addLibrary(*(yyvsp[(1) - (1)].StrVal)); delete (yyvsp[(1) - (1)].StrVal); @@ -5079,14 +5046,14 @@ yyreduce: break; case 228: -#line 2197 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2151 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; case 229: -#line 2206 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2160 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription()); @@ -5100,7 +5067,7 @@ yyreduce: break; case 230: -#line 2216 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2170 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription()); @@ -5114,7 +5081,7 @@ yyreduce: break; case 231: -#line 2227 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2181 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList); CHECK_FOR_ERROR @@ -5122,7 +5089,7 @@ yyreduce: break; case 232: -#line 2231 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2185 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList); struct ArgListEntry E; @@ -5135,7 +5102,7 @@ yyreduce: break; case 233: -#line 2240 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2194 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ArgList) = new ArgListType; struct ArgListEntry E; @@ -5148,7 +5115,7 @@ yyreduce: break; case 234: -#line 2249 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2203 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ArgList) = 0; CHECK_FOR_ERROR @@ -5156,7 +5123,7 @@ yyreduce: break; case 235: -#line 2255 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2209 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { std::string FunctionName(*(yyvsp[(3) - (9)].StrVal)); delete (yyvsp[(3) - (9)].StrVal); // Free strdup'd memory! @@ -5169,7 +5136,9 @@ yyreduce: std::vector ParamTypeList; ParamAttrsVector Attrs; if ((yyvsp[(7) - (9)].ParamAttrs) != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = (yyvsp[(7) - (9)].ParamAttrs); + ParamAttrsWithIndex PAWI; + PAWI.index = 0; + PAWI.attrs = (yyvsp[(7) - (9)].ParamAttrs); Attrs.push_back(PAWI); } if ((yyvsp[(5) - (9)].ArgList)) { // If there are arguments... @@ -5181,7 +5150,9 @@ yyreduce: ParamTypeList.push_back(Ty); if (Ty != Type::VoidTy) if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = index; PAWI.attrs = I->Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = index; + PAWI.attrs = I->Attrs; Attrs.push_back(PAWI); } } @@ -5194,7 +5165,7 @@ yyreduce: if (!Attrs.empty()) PAL = ParamAttrsList::get(Attrs); - FunctionType *FT = FunctionType::get(*(yyvsp[(2) - (9)].TypeVal), ParamTypeList, isVarArg, PAL); + FunctionType *FT = FunctionType::get(*(yyvsp[(2) - (9)].TypeVal), ParamTypeList, isVarArg); const PointerType *PFT = PointerType::get(FT); delete (yyvsp[(2) - (9)].TypeVal); @@ -5211,19 +5182,24 @@ yyreduce: // Move the function to the end of the list, from whereever it was // previously inserted. Fn = cast(FWRef); + assert(!Fn->getParamAttrs() && "Forward reference has parameter attributes!"); CurModule.CurrentModule->getFunctionList().remove(Fn); CurModule.CurrentModule->getFunctionList().push_back(Fn); } else if (!FunctionName.empty() && // Merge with an earlier prototype? (Fn = CurModule.CurrentModule->getFunction(FunctionName))) { - if (Fn->getFunctionType() != FT) { + if (Fn->getFunctionType() != FT ) { // The existing function doesn't have the same type. This is an overload // error. GEN_ERROR("Overload of function '" + FunctionName + "' not permitted."); + } else if (Fn->getParamAttrs() != PAL) { + // The existing function doesn't have the same parameter attributes. + // This is an overload error. + GEN_ERROR("Overload of function '" + FunctionName + "' not permitted."); } else if (!CurFun.isDeclare && !Fn->isDeclaration()) { // Neither the existing or the current function is a declaration and they // have the same name and same type. Clearly this is a redefinition. GEN_ERROR("Redefinition of function '" + FunctionName + "'"); - } if (Fn->isDeclaration()) { + } else if (Fn->isDeclaration()) { // Make sure to strip off any argument names so we can't get conflicts. for (Function::arg_iterator AI = Fn->arg_begin(), AE = Fn->arg_end(); AI != AE; ++AI) @@ -5232,7 +5208,6 @@ yyreduce: } else { // Not already defined? Fn = new Function(FT, GlobalValue::ExternalWeakLinkage, FunctionName, CurModule.CurrentModule); - InsertValue(Fn, CurModule.Values); } @@ -5246,6 +5221,7 @@ yyreduce: Fn->setVisibility(CurFun.Visibility); } Fn->setCallingConv((yyvsp[(1) - (9)].UIntVal)); + Fn->setParamAttrs(PAL); Fn->setAlignment((yyvsp[(9) - (9)].UIntVal)); if ((yyvsp[(8) - (9)].StrVal)) { Fn->setSection(*(yyvsp[(8) - (9)].StrVal)); @@ -5279,7 +5255,7 @@ yyreduce: break; case 238: -#line 2377 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2340 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FunctionVal) = CurFun.CurrentFunction; @@ -5291,7 +5267,7 @@ yyreduce: break; case 241: -#line 2388 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2351 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); CHECK_FOR_ERROR @@ -5299,7 +5275,7 @@ yyreduce: break; case 242: -#line 2393 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2356 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { CurFun.CurrentFunction->setLinkage((yyvsp[(1) - (3)].Linkage)); CurFun.CurrentFunction->setVisibility((yyvsp[(2) - (3)].Visibility)); @@ -5310,7 +5286,7 @@ yyreduce: break; case 243: -#line 2405 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2368 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; CHECK_FOR_ERROR @@ -5318,7 +5294,7 @@ yyreduce: break; case 244: -#line 2409 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2372 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; CHECK_FOR_ERROR @@ -5326,7 +5302,7 @@ yyreduce: break; case 245: -#line 2414 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2377 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // A reference to a direct constant (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val)); CHECK_FOR_ERROR @@ -5334,7 +5310,7 @@ yyreduce: break; case 246: -#line 2418 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2381 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val)); CHECK_FOR_ERROR @@ -5342,7 +5318,7 @@ yyreduce: break; case 247: -#line 2422 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2385 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Perhaps it's an FP constant? (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal)); CHECK_FOR_ERROR @@ -5350,7 +5326,7 @@ yyreduce: break; case 248: -#line 2426 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2389 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue()); CHECK_FOR_ERROR @@ -5358,7 +5334,7 @@ yyreduce: break; case 249: -#line 2430 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2393 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse()); CHECK_FOR_ERROR @@ -5366,7 +5342,7 @@ yyreduce: break; case 250: -#line 2434 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2397 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::createNull(); CHECK_FOR_ERROR @@ -5374,7 +5350,7 @@ yyreduce: break; case 251: -#line 2438 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2401 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::createUndef(); CHECK_FOR_ERROR @@ -5382,7 +5358,7 @@ yyreduce: break; case 252: -#line 2442 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2405 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // A vector zero constant. (yyval.ValIDVal) = ValID::createZeroInit(); CHECK_FOR_ERROR @@ -5390,7 +5366,7 @@ yyreduce: break; case 253: -#line 2446 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2409 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Nonempty unsized packed vector const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType(); int NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); @@ -5419,7 +5395,7 @@ yyreduce: break; case 254: -#line 2471 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2434 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal)); CHECK_FOR_ERROR @@ -5427,7 +5403,7 @@ yyreduce: break; case 255: -#line 2475 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2438 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::createInlineAsm(*(yyvsp[(3) - (5)].StrVal), *(yyvsp[(5) - (5)].StrVal), (yyvsp[(2) - (5)].BoolVal)); delete (yyvsp[(3) - (5)].StrVal); @@ -5437,7 +5413,7 @@ yyreduce: break; case 256: -#line 2485 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2448 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Is it an integer reference...? (yyval.ValIDVal) = ValID::createLocalID((yyvsp[(1) - (1)].UIntVal)); CHECK_FOR_ERROR @@ -5445,7 +5421,7 @@ yyreduce: break; case 257: -#line 2489 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2452 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[(1) - (1)].UIntVal)); CHECK_FOR_ERROR @@ -5453,7 +5429,7 @@ yyreduce: break; case 258: -#line 2493 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2456 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Is it a named reference...? (yyval.ValIDVal) = ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal)); delete (yyvsp[(1) - (1)].StrVal); @@ -5462,7 +5438,7 @@ yyreduce: break; case 259: -#line 2498 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2461 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Is it a named reference...? (yyval.ValIDVal) = ValID::createGlobalName(*(yyvsp[(1) - (1)].StrVal)); delete (yyvsp[(1) - (1)].StrVal); @@ -5471,7 +5447,7 @@ yyreduce: break; case 262: -#line 2511 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2474 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -5482,7 +5458,7 @@ yyreduce: break; case 263: -#line 2520 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2483 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); CHECK_FOR_ERROR @@ -5490,7 +5466,7 @@ yyreduce: break; case 264: -#line 2524 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2487 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Do not allow functions with 0 basic blocks (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); CHECK_FOR_ERROR @@ -5498,7 +5474,7 @@ yyreduce: break; case 265: -#line 2533 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2496 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { setValueName((yyvsp[(3) - (3)].TermInstVal), (yyvsp[(2) - (3)].StrVal)); CHECK_FOR_ERROR @@ -5510,7 +5486,7 @@ yyreduce: break; case 266: -#line 2542 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2505 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (CastInst *CI1 = dyn_cast((yyvsp[(2) - (2)].InstVal))) if (CastInst *CI2 = dyn_cast(CI1->getOperand(0))) @@ -5523,7 +5499,7 @@ yyreduce: break; case 267: -#line 2551 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2514 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Empty space between instruction lists (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum)); CHECK_FOR_ERROR @@ -5531,7 +5507,7 @@ yyreduce: break; case 268: -#line 2555 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2518 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Labelled (named) basic block (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal))); delete (yyvsp[(1) - (1)].StrVal); @@ -5541,7 +5517,7 @@ yyreduce: break; case 269: -#line 2562 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2525 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Return with a result... (yyval.TermInstVal) = new ReturnInst((yyvsp[(2) - (2)].ValueVal)); CHECK_FOR_ERROR @@ -5549,7 +5525,7 @@ yyreduce: break; case 270: -#line 2566 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2529 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Return with no result... (yyval.TermInstVal) = new ReturnInst(); CHECK_FOR_ERROR @@ -5557,7 +5533,7 @@ yyreduce: break; case 271: -#line 2570 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2533 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Unconditional Branch... BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal)); CHECK_FOR_ERROR @@ -5566,7 +5542,7 @@ yyreduce: break; case 272: -#line 2575 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2538 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { assert(cast((yyvsp[(2) - (9)].PrimType))->getBitWidth() == 1 && "Not Bool?"); BasicBlock* tmpBBA = getBBVal((yyvsp[(6) - (9)].ValIDVal)); @@ -5580,7 +5556,7 @@ yyreduce: break; case 273: -#line 2585 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2548 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType), (yyvsp[(3) - (9)].ValIDVal)); CHECK_FOR_ERROR @@ -5603,7 +5579,7 @@ yyreduce: break; case 274: -#line 2604 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2567 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType), (yyvsp[(3) - (8)].ValIDVal)); CHECK_FOR_ERROR @@ -5616,7 +5592,7 @@ yyreduce: break; case 275: -#line 2614 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2577 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Handle the short syntax @@ -5626,28 +5602,14 @@ yyreduce: !(Ty = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; - ParamAttrsVector Attrs; - if ((yyvsp[(8) - (14)].ParamAttrs) != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = (yyvsp[(8) - (14)].ParamAttrs); - Attrs.push_back(PAWI); - } ParamList::iterator I = (yyvsp[(6) - (14)].ParamList)->begin(), E = (yyvsp[(6) - (14)].ParamList)->end(); - unsigned index = 1; - for (; I != E; ++I, ++index) { + for (; I != E; ++I) { const Type *Ty = I->Val->getType(); if (Ty == Type::VoidTy) GEN_ERROR("Short call syntax cannot be used with varargs"); ParamTypes.push_back(Ty); - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = index; PAWI.attrs = I->Attrs; - Attrs.push_back(PAWI); - } } - - ParamAttrsList *PAL = 0; - if (!Attrs.empty()) - PAL = ParamAttrsList::get(Attrs); - Ty = FunctionType::get((yyvsp[(3) - (14)].TypeVal)->get(), ParamTypes, false, PAL); + Ty = FunctionType::get((yyvsp[(3) - (14)].TypeVal)->get(), ParamTypes, false); PFTy = PointerType::get(Ty); } @@ -5660,6 +5622,12 @@ yyreduce: BasicBlock *Except = getBBVal((yyvsp[(14) - (14)].ValIDVal)); CHECK_FOR_ERROR + ParamAttrsVector Attrs; + if ((yyvsp[(8) - (14)].ParamAttrs) != ParamAttr::None) { + ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = (yyvsp[(8) - (14)].ParamAttrs); + Attrs.push_back(PAWI); + } + // Check the arguments ValueList Args; if ((yyvsp[(6) - (14)].ParamList)->empty()) { // Has no arguments? @@ -5673,12 +5641,19 @@ yyreduce: FunctionType::param_iterator I = Ty->param_begin(); FunctionType::param_iterator E = Ty->param_end(); ParamList::iterator ArgI = (yyvsp[(6) - (14)].ParamList)->begin(), ArgE = (yyvsp[(6) - (14)].ParamList)->end(); + unsigned index = 1; - for (; ArgI != ArgE && I != E; ++ArgI, ++I) { + for (; ArgI != ArgE && I != E; ++ArgI, ++I, ++index) { if (ArgI->Val->getType() != *I) GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" + (*I)->getDescription() + "'"); Args.push_back(ArgI->Val); + if (ArgI->Attrs != ParamAttr::None) { + ParamAttrsWithIndex PAWI; + PAWI.index = index; + PAWI.attrs = ArgI->Attrs; + Attrs.push_back(PAWI); + } } if (Ty->isVarArg()) { @@ -5689,9 +5664,14 @@ yyreduce: GEN_ERROR("Invalid number of parameters detected"); } + ParamAttrsList *PAL = 0; + if (!Attrs.empty()) + PAL = ParamAttrsList::get(Attrs); + // Create the InvokeInst InvokeInst *II = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); II->setCallingConv((yyvsp[(2) - (14)].UIntVal)); + II->setParamAttrs(PAL); (yyval.TermInstVal) = II; delete (yyvsp[(6) - (14)].ParamList); CHECK_FOR_ERROR @@ -5699,7 +5679,7 @@ yyreduce: break; case 276: -#line 2693 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2660 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TermInstVal) = new UnwindInst(); CHECK_FOR_ERROR @@ -5707,7 +5687,7 @@ yyreduce: break; case 277: -#line 2697 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2664 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TermInstVal) = new UnreachableInst(); CHECK_FOR_ERROR @@ -5715,7 +5695,7 @@ yyreduce: break; case 278: -#line 2704 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2671 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable); Constant *V = cast(getExistingVal((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal))); @@ -5730,7 +5710,7 @@ yyreduce: break; case 279: -#line 2715 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2682 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.JumpTable) = new std::vector >(); Constant *V = cast(getExistingVal((yyvsp[(1) - (5)].PrimType), (yyvsp[(2) - (5)].ValIDVal))); @@ -5746,7 +5726,7 @@ yyreduce: break; case 280: -#line 2728 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2695 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Is this definition named?? if so, assign the name... setValueName((yyvsp[(2) - (2)].InstVal), (yyvsp[(1) - (2)].StrVal)); @@ -5758,7 +5738,7 @@ yyreduce: break; case 281: -#line 2738 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2705 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Used for PHI nodes if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (6)].TypeVal))->getDescription()); @@ -5773,7 +5753,7 @@ yyreduce: break; case 282: -#line 2749 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2716 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.PHIList) = (yyvsp[(1) - (7)].PHIList); Value* tmpVal = getVal((yyvsp[(1) - (7)].PHIList)->front().first->getType(), (yyvsp[(4) - (7)].ValIDVal)); @@ -5785,63 +5765,69 @@ yyreduce: break; case 283: -#line 2759 "/llvm/lib/AsmParser/llvmAsmParser.y" - { +#line 2726 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" + { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription()); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription()); // Used for call and invoke instructions (yyval.ParamList) = new ParamList(); - ParamListEntry E; E.Attrs = (yyvsp[(3) - (3)].ParamAttrs); E.Val = getVal((yyvsp[(1) - (3)].TypeVal)->get(), (yyvsp[(2) - (3)].ValIDVal)); + ParamListEntry E; E.Attrs = (yyvsp[(2) - (4)].ParamAttrs) | (yyvsp[(4) - (4)].ParamAttrs); E.Val = getVal((yyvsp[(1) - (4)].TypeVal)->get(), (yyvsp[(3) - (4)].ValIDVal)); (yyval.ParamList)->push_back(E); - delete (yyvsp[(1) - (3)].TypeVal); + delete (yyvsp[(1) - (4)].TypeVal); + CHECK_FOR_ERROR ;} break; case 284: -#line 2768 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2737 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 // Labels are only valid in ASMs (yyval.ParamList) = new ParamList(); - ParamListEntry E; E.Attrs = (yyvsp[(3) - (3)].ParamAttrs); E.Val = getBBVal((yyvsp[(2) - (3)].ValIDVal)); + ParamListEntry E; E.Attrs = (yyvsp[(2) - (4)].ParamAttrs) | (yyvsp[(4) - (4)].ParamAttrs); E.Val = getBBVal((yyvsp[(3) - (4)].ValIDVal)); (yyval.ParamList)->push_back(E); + CHECK_FOR_ERROR ;} break; case 285: -#line 2774 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2745 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription()); - (yyval.ParamList) = (yyvsp[(1) - (5)].ParamList); - ParamListEntry E; E.Attrs = (yyvsp[(5) - (5)].ParamAttrs); E.Val = getVal((yyvsp[(3) - (5)].TypeVal)->get(), (yyvsp[(4) - (5)].ValIDVal)); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription()); + (yyval.ParamList) = (yyvsp[(1) - (6)].ParamList); + ParamListEntry E; E.Attrs = (yyvsp[(4) - (6)].ParamAttrs) | (yyvsp[(6) - (6)].ParamAttrs); E.Val = getVal((yyvsp[(3) - (6)].TypeVal)->get(), (yyvsp[(5) - (6)].ValIDVal)); (yyval.ParamList)->push_back(E); - delete (yyvsp[(3) - (5)].TypeVal); + delete (yyvsp[(3) - (6)].TypeVal); CHECK_FOR_ERROR ;} break; case 286: -#line 2783 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2755 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.ParamList) = (yyvsp[(1) - (5)].ParamList); - ParamListEntry E; E.Attrs = (yyvsp[(5) - (5)].ParamAttrs); E.Val = getBBVal((yyvsp[(4) - (5)].ValIDVal)); + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 + (yyval.ParamList) = (yyvsp[(1) - (6)].ParamList); + ParamListEntry E; E.Attrs = (yyvsp[(4) - (6)].ParamAttrs) | (yyvsp[(6) - (6)].ParamAttrs); E.Val = getBBVal((yyvsp[(5) - (6)].ValIDVal)); (yyval.ParamList)->push_back(E); CHECK_FOR_ERROR ;} break; case 287: -#line 2789 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2762 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamList) = new ParamList(); ;} break; case 288: -#line 2792 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2765 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValueList) = new std::vector(); ;} break; case 289: -#line 2793 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2766 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList); (yyval.ValueList)->push_back((yyvsp[(3) - (3)].ValueVal)); @@ -5850,7 +5836,7 @@ yyreduce: break; case 290: -#line 2800 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2773 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; CHECK_FOR_ERROR @@ -5858,7 +5844,7 @@ yyreduce: break; case 291: -#line 2804 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2777 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; CHECK_FOR_ERROR @@ -5866,7 +5852,7 @@ yyreduce: break; case 292: -#line 2809 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2782 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription()); @@ -5886,7 +5872,7 @@ yyreduce: break; case 293: -#line 2825 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2798 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription()); @@ -5907,7 +5893,7 @@ yyreduce: break; case 294: -#line 2842 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2815 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription()); @@ -5925,7 +5911,7 @@ yyreduce: break; case 295: -#line 2856 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2829 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription()); @@ -5943,7 +5929,7 @@ yyreduce: break; case 296: -#line 2870 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2843 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription()); @@ -5959,7 +5945,7 @@ yyreduce: break; case 297: -#line 2882 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2855 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(2) - (6)].ValueVal)->getType() != Type::Int1Ty) GEN_ERROR("select condition must be boolean"); @@ -5971,7 +5957,7 @@ yyreduce: break; case 298: -#line 2890 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2863 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription()); @@ -5982,7 +5968,7 @@ yyreduce: break; case 299: -#line 2897 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2870 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal))) GEN_ERROR("Invalid extractelement operands"); @@ -5992,7 +5978,7 @@ yyreduce: break; case 300: -#line 2903 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2876 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!InsertElementInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal))) GEN_ERROR("Invalid insertelement operands"); @@ -6002,7 +5988,7 @@ yyreduce: break; case 301: -#line 2909 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2882 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!ShuffleVectorInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal))) GEN_ERROR("Invalid shufflevector operands"); @@ -6012,7 +5998,7 @@ yyreduce: break; case 302: -#line 2915 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2888 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { const Type *Ty = (yyvsp[(2) - (2)].PHIList)->front().first->getType(); if (!Ty->isFirstClassType()) @@ -6031,7 +6017,7 @@ yyreduce: break; case 303: -#line 2931 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2904 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { // Handle the short syntax @@ -6041,29 +6027,14 @@ yyreduce: !(Ty = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; - ParamAttrsVector Attrs; - if ((yyvsp[(8) - (8)].ParamAttrs) != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = (yyvsp[(8) - (8)].ParamAttrs); - Attrs.push_back(PAWI); - } - unsigned index = 1; ParamList::iterator I = (yyvsp[(6) - (8)].ParamList)->begin(), E = (yyvsp[(6) - (8)].ParamList)->end(); - for (; I != E; ++I, ++index) { + for (; I != E; ++I) { const Type *Ty = I->Val->getType(); if (Ty == Type::VoidTy) GEN_ERROR("Short call syntax cannot be used with varargs"); ParamTypes.push_back(Ty); - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = index; PAWI.attrs = I->Attrs; - Attrs.push_back(PAWI); - } } - - ParamAttrsList *PAL = 0; - if (!Attrs.empty()) - PAL = ParamAttrsList::get(Attrs); - - Ty = FunctionType::get((yyvsp[(3) - (8)].TypeVal)->get(), ParamTypes, false, PAL); + Ty = FunctionType::get((yyvsp[(3) - (8)].TypeVal)->get(), ParamTypes, false); PFTy = PointerType::get(Ty); } @@ -6079,6 +6050,14 @@ yyreduce: theF->getName() + "'"); } + // Set up the ParamAttrs for the function + ParamAttrsVector Attrs; + if ((yyvsp[(8) - (8)].ParamAttrs) != ParamAttr::None) { + ParamAttrsWithIndex PAWI; + PAWI.index = 0; + PAWI.attrs = (yyvsp[(8) - (8)].ParamAttrs); + Attrs.push_back(PAWI); + } // Check the arguments ValueList Args; if ((yyvsp[(6) - (8)].ParamList)->empty()) { // Has no arguments? @@ -6088,17 +6067,23 @@ yyreduce: "expects arguments"); } else { // Has arguments? // Loop through FunctionType's arguments and ensure they are specified - // correctly! - // + // correctly. Also, gather any parameter attributes. FunctionType::param_iterator I = Ty->param_begin(); FunctionType::param_iterator E = Ty->param_end(); ParamList::iterator ArgI = (yyvsp[(6) - (8)].ParamList)->begin(), ArgE = (yyvsp[(6) - (8)].ParamList)->end(); + unsigned index = 1; - for (; ArgI != ArgE && I != E; ++ArgI, ++I) { + for (; ArgI != ArgE && I != E; ++ArgI, ++I, ++index) { if (ArgI->Val->getType() != *I) GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" + (*I)->getDescription() + "'"); Args.push_back(ArgI->Val); + if (ArgI->Attrs != ParamAttr::None) { + ParamAttrsWithIndex PAWI; + PAWI.index = index; + PAWI.attrs = ArgI->Attrs; + Attrs.push_back(PAWI); + } } if (Ty->isVarArg()) { if (I == E) @@ -6107,10 +6092,17 @@ yyreduce: } else if (I != E || ArgI != ArgE) GEN_ERROR("Invalid number of parameters detected"); } + + // Finish off the ParamAttrs and check them + ParamAttrsList *PAL = 0; + if (!Attrs.empty()) + PAL = ParamAttrsList::get(Attrs); + // Create the call node CallInst *CI = new CallInst(V, Args.begin(), Args.end()); CI->setTailCall((yyvsp[(1) - (8)].BoolVal)); CI->setCallingConv((yyvsp[(2) - (8)].UIntVal)); + CI->setParamAttrs(PAL); (yyval.InstVal) = CI; delete (yyvsp[(6) - (8)].ParamList); delete (yyvsp[(3) - (8)].TypeVal); @@ -6119,7 +6111,7 @@ yyreduce: break; case 304: -#line 3015 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2994 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal); CHECK_FOR_ERROR @@ -6127,7 +6119,7 @@ yyreduce: break; case 305: -#line 3020 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2999 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; CHECK_FOR_ERROR @@ -6135,7 +6127,7 @@ yyreduce: break; case 306: -#line 3024 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3003 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; CHECK_FOR_ERROR @@ -6143,7 +6135,7 @@ yyreduce: break; case 307: -#line 3031 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3010 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription()); @@ -6154,7 +6146,7 @@ yyreduce: break; case 308: -#line 3038 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3017 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription()); @@ -6166,7 +6158,7 @@ yyreduce: break; case 309: -#line 3046 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3025 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription()); @@ -6177,7 +6169,7 @@ yyreduce: break; case 310: -#line 3053 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3032 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription()); @@ -6189,7 +6181,7 @@ yyreduce: break; case 311: -#line 3061 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3040 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!isa((yyvsp[(2) - (2)].ValueVal)->getType())) GEN_ERROR("Trying to free nonpointer type " + @@ -6200,7 +6192,7 @@ yyreduce: break; case 312: -#line 3069 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3048 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription()); @@ -6218,7 +6210,7 @@ yyreduce: break; case 313: -#line 3083 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3062 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (7)].TypeVal))->getDescription()); @@ -6239,7 +6231,7 @@ yyreduce: break; case 314: -#line 3100 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3079 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription()); @@ -6259,7 +6251,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 6263 "llvmAsmParser.tab.c" +#line 6255 "llvmAsmParser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -6473,18 +6465,12 @@ yyreturn: } -#line 3117 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3096 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" // common code from the two 'RunVMAsmParser' functions static Module* RunParser(Module * M) { - - llvmAsmlineno = 1; // Reset the current line number... CurModule.CurrentModule = M; -#if YYDEBUG - yydebug = Debug; -#endif - // Check to make sure the parser succeeded if (yyparse()) { if (ParserResult) @@ -6536,21 +6522,21 @@ static Module* RunParser(Module * M) { } void llvm::GenerateError(const std::string &message, int LineNo) { - if (LineNo == -1) LineNo = llvmAsmlineno; + if (LineNo == -1) LineNo = LLLgetLineNo(); // TODO: column number in exception if (TheParseError) - TheParseError->setError(CurFilename, message, LineNo); + TheParseError->setError(LLLgetFilename(), message, LineNo); TriggerError = 1; } int yyerror(const char *ErrorMsg) { - std::string where - = std::string((CurFilename == "-") ? std::string("") : CurFilename) - + ":" + utostr((unsigned) llvmAsmlineno) + ": "; + std::string where = LLLgetFilename() + ":" + utostr(LLLgetLineNo()) + ": "; std::string errMsg = where + "error: " + std::string(ErrorMsg); - if (yychar != YYEMPTY && yychar != 0) - errMsg += " while reading token: '" + std::string(llvmAsmtext, llvmAsmleng)+ - "'"; + if (yychar != YYEMPTY && yychar != 0) { + errMsg += " while reading token: '"; + errMsg += std::string(LLLgetTokenStart(), + LLLgetTokenStart()+LLLgetTokenLength()) + "'"; + } GenerateError(errMsg); return 0; } diff --git a/lib/AsmParser/llvmAsmParser.h.cvs b/lib/AsmParser/llvmAsmParser.h.cvs index 601fc404fbc..88b51c3187d 100644 --- a/lib/AsmParser/llvmAsmParser.h.cvs +++ b/lib/AsmParser/llvmAsmParser.h.cvs @@ -179,8 +179,8 @@ NOALIAS = 395, BYVAL = 396, NEST = 397, - CONST = 398, - PURE = 399, + READNONE = 398, + READONLY = 399, DEFAULT = 400, HIDDEN = 401, PROTECTED = 402 @@ -327,8 +327,8 @@ #define NOALIAS 395 #define BYVAL 396 #define NEST 397 -#define CONST 398 -#define PURE 399 +#define READNONE 398 +#define READONLY 399 #define DEFAULT 400 #define HIDDEN 401 #define PROTECTED 402 @@ -338,7 +338,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 968 "/llvm/lib/AsmParser/llvmAsmParser.y" +#line 945 "/home/duncan/LLVM/llvm.top/llvm/lib/AsmParser/llvmAsmParser.y" { llvm::Module *ModuleVal; llvm::Function *FunctionVal; @@ -385,7 +385,7 @@ typedef union YYSTYPE llvm::ICmpInst::Predicate IPredicate; llvm::FCmpInst::Predicate FPredicate; } -/* Line 1529 of yacc.c. */ +/* Line 1489 of yacc.c. */ #line 390 "llvmAsmParser.tab.h" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y index a1373ce18da..683b95b8fba 100644 --- a/lib/AsmParser/llvmAsmParser.y +++ b/lib/AsmParser/llvmAsmParser.y @@ -1328,61 +1328,36 @@ Types CHECK_FOR_ERROR } | Types '(' ArgTypeListI ')' OptFuncAttrs { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. std::vector Params; - ParamAttrsVector Attrs; - if ($5 != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = 0; X.attrs = $5; - Attrs.push_back(X); - } - unsigned index = 1; TypeWithAttrsList::iterator I = $3->begin(), E = $3->end(); - for (; I != E; ++I, ++index) { + for (; I != E; ++I ) { const Type *Ty = I->Ty->get(); Params.push_back(Ty); - if (Ty != Type::VoidTy) - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = index; X.attrs = I->Attrs; - Attrs.push_back(X); - } } bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); - ParamAttrsList *ActualAttrs = 0; - if (!Attrs.empty()) - ActualAttrs = ParamAttrsList::get(Attrs); - FunctionType *FT = FunctionType::get(*$1, Params, isVarArg, ActualAttrs); + FunctionType *FT = FunctionType::get(*$1, Params, isVarArg); delete $3; // Delete the argument list delete $1; // Delete the return type handle $$ = new PATypeHolder(HandleUpRefs(FT)); CHECK_FOR_ERROR } | VOID '(' ArgTypeListI ')' OptFuncAttrs { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. std::vector Params; - ParamAttrsVector Attrs; - if ($5 != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = 0; X.attrs = $5; - Attrs.push_back(X); - } TypeWithAttrsList::iterator I = $3->begin(), E = $3->end(); - unsigned index = 1; - for ( ; I != E; ++I, ++index) { + for ( ; I != E; ++I ) { const Type* Ty = I->Ty->get(); Params.push_back(Ty); - if (Ty != Type::VoidTy) - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = index; X.attrs = I->Attrs; - Attrs.push_back(X); - } } bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); - ParamAttrsList *ActualAttrs = 0; - if (!Attrs.empty()) - ActualAttrs = ParamAttrsList::get(Attrs); - - FunctionType *FT = FunctionType::get($1, Params, isVarArg, ActualAttrs); + FunctionType *FT = FunctionType::get($1, Params, isVarArg); delete $3; // Delete the argument list $$ = new PATypeHolder(HandleUpRefs(FT)); CHECK_FOR_ERROR @@ -1434,9 +1409,11 @@ Types ; ArgType - : Types OptParamAttrs { + : Types OptParamAttrs { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. $$.Ty = $1; - $$.Attrs = $2; + $$.Attrs = ParamAttr::None; } ; @@ -2241,7 +2218,9 @@ FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')' std::vector ParamTypeList; ParamAttrsVector Attrs; if ($7 != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = $7; + ParamAttrsWithIndex PAWI; + PAWI.index = 0; + PAWI.attrs = $7; Attrs.push_back(PAWI); } if ($5) { // If there are arguments... @@ -2253,7 +2232,9 @@ FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')' ParamTypeList.push_back(Ty); if (Ty != Type::VoidTy) if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = index; PAWI.attrs = I->Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = index; + PAWI.attrs = I->Attrs; Attrs.push_back(PAWI); } } @@ -2266,7 +2247,7 @@ FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')' if (!Attrs.empty()) PAL = ParamAttrsList::get(Attrs); - FunctionType *FT = FunctionType::get(*$2, ParamTypeList, isVarArg, PAL); + FunctionType *FT = FunctionType::get(*$2, ParamTypeList, isVarArg); const PointerType *PFT = PointerType::get(FT); delete $2; @@ -2283,19 +2264,24 @@ FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')' // Move the function to the end of the list, from whereever it was // previously inserted. Fn = cast(FWRef); + assert(!Fn->getParamAttrs() && "Forward reference has parameter attributes!"); CurModule.CurrentModule->getFunctionList().remove(Fn); CurModule.CurrentModule->getFunctionList().push_back(Fn); } else if (!FunctionName.empty() && // Merge with an earlier prototype? (Fn = CurModule.CurrentModule->getFunction(FunctionName))) { - if (Fn->getFunctionType() != FT) { + if (Fn->getFunctionType() != FT ) { // The existing function doesn't have the same type. This is an overload // error. GEN_ERROR("Overload of function '" + FunctionName + "' not permitted."); + } else if (Fn->getParamAttrs() != PAL) { + // The existing function doesn't have the same parameter attributes. + // This is an overload error. + GEN_ERROR("Overload of function '" + FunctionName + "' not permitted."); } else if (!CurFun.isDeclare && !Fn->isDeclaration()) { // Neither the existing or the current function is a declaration and they // have the same name and same type. Clearly this is a redefinition. GEN_ERROR("Redefinition of function '" + FunctionName + "'"); - } if (Fn->isDeclaration()) { + } else if (Fn->isDeclaration()) { // Make sure to strip off any argument names so we can't get conflicts. for (Function::arg_iterator AI = Fn->arg_begin(), AE = Fn->arg_end(); AI != AE; ++AI) @@ -2304,7 +2290,6 @@ FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')' } else { // Not already defined? Fn = new Function(FT, GlobalValue::ExternalWeakLinkage, FunctionName, CurModule.CurrentModule); - InsertValue(Fn, CurModule.Values); } @@ -2318,6 +2303,7 @@ FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')' Fn->setVisibility(CurFun.Visibility); } Fn->setCallingConv($1); + Fn->setParamAttrs(PAL); Fn->setAlignment($9); if ($8) { Fn->setSection(*$8); @@ -2597,28 +2583,14 @@ BBTerminatorInst : RET ResolvedVal { // Return with a result... !(Ty = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; - ParamAttrsVector Attrs; - if ($8 != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = $8; - Attrs.push_back(PAWI); - } ParamList::iterator I = $6->begin(), E = $6->end(); - unsigned index = 1; - for (; I != E; ++I, ++index) { + for (; I != E; ++I) { const Type *Ty = I->Val->getType(); if (Ty == Type::VoidTy) GEN_ERROR("Short call syntax cannot be used with varargs"); ParamTypes.push_back(Ty); - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = index; PAWI.attrs = I->Attrs; - Attrs.push_back(PAWI); - } } - - ParamAttrsList *PAL = 0; - if (!Attrs.empty()) - PAL = ParamAttrsList::get(Attrs); - Ty = FunctionType::get($3->get(), ParamTypes, false, PAL); + Ty = FunctionType::get($3->get(), ParamTypes, false); PFTy = PointerType::get(Ty); } @@ -2631,6 +2603,12 @@ BBTerminatorInst : RET ResolvedVal { // Return with a result... BasicBlock *Except = getBBVal($14); CHECK_FOR_ERROR + ParamAttrsVector Attrs; + if ($8 != ParamAttr::None) { + ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = $8; + Attrs.push_back(PAWI); + } + // Check the arguments ValueList Args; if ($6->empty()) { // Has no arguments? @@ -2644,12 +2622,19 @@ BBTerminatorInst : RET ResolvedVal { // Return with a result... FunctionType::param_iterator I = Ty->param_begin(); FunctionType::param_iterator E = Ty->param_end(); ParamList::iterator ArgI = $6->begin(), ArgE = $6->end(); + unsigned index = 1; - for (; ArgI != ArgE && I != E; ++ArgI, ++I) { + for (; ArgI != ArgE && I != E; ++ArgI, ++I, ++index) { if (ArgI->Val->getType() != *I) GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" + (*I)->getDescription() + "'"); Args.push_back(ArgI->Val); + if (ArgI->Attrs != ParamAttr::None) { + ParamAttrsWithIndex PAWI; + PAWI.index = index; + PAWI.attrs = ArgI->Attrs; + Attrs.push_back(PAWI); + } } if (Ty->isVarArg()) { @@ -2660,9 +2645,14 @@ BBTerminatorInst : RET ResolvedVal { // Return with a result... GEN_ERROR("Invalid number of parameters detected"); } + ParamAttrsList *PAL = 0; + if (!Attrs.empty()) + PAL = ParamAttrsList::get(Attrs); + // Create the InvokeInst InvokeInst *II = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); II->setCallingConv($2); + II->setParamAttrs(PAL); $$ = II; delete $6; CHECK_FOR_ERROR @@ -2733,33 +2723,39 @@ PHIList : Types '[' ValueRef ',' ValueRef ']' { // Used for PHI nodes }; -ParamList : Types ValueRef OptParamAttrs { +ParamList : Types OptParamAttrs ValueRef OptParamAttrs { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription()); // Used for call and invoke instructions $$ = new ParamList(); - ParamListEntry E; E.Attrs = $3; E.Val = getVal($1->get(), $2); + ParamListEntry E; E.Attrs = $2 | $4; E.Val = getVal($1->get(), $3); $$->push_back(E); delete $1; + CHECK_FOR_ERROR } - | LABEL ValueRef OptParamAttrs { + | LABEL OptParamAttrs ValueRef OptParamAttrs { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 // Labels are only valid in ASMs $$ = new ParamList(); - ParamListEntry E; E.Attrs = $3; E.Val = getBBVal($2); + ParamListEntry E; E.Attrs = $2 | $4; E.Val = getBBVal($3); $$->push_back(E); + CHECK_FOR_ERROR } - | ParamList ',' Types ValueRef OptParamAttrs { + | ParamList ',' Types OptParamAttrs ValueRef OptParamAttrs { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*$3)->getDescription()); $$ = $1; - ParamListEntry E; E.Attrs = $5; E.Val = getVal($3->get(), $4); + ParamListEntry E; E.Attrs = $4 | $6; E.Val = getVal($3->get(), $5); $$->push_back(E); delete $3; CHECK_FOR_ERROR } - | ParamList ',' LABEL ValueRef OptParamAttrs { + | ParamList ',' LABEL OptParamAttrs ValueRef OptParamAttrs { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 $$ = $1; - ParamListEntry E; E.Attrs = $5; E.Val = getBBVal($4); + ParamListEntry E; E.Attrs = $4 | $6; E.Val = getBBVal($5); $$->push_back(E); CHECK_FOR_ERROR } @@ -2914,29 +2910,14 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef { !(Ty = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; - ParamAttrsVector Attrs; - if ($8 != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = $8; - Attrs.push_back(PAWI); - } - unsigned index = 1; ParamList::iterator I = $6->begin(), E = $6->end(); - for (; I != E; ++I, ++index) { + for (; I != E; ++I) { const Type *Ty = I->Val->getType(); if (Ty == Type::VoidTy) GEN_ERROR("Short call syntax cannot be used with varargs"); ParamTypes.push_back(Ty); - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = index; PAWI.attrs = I->Attrs; - Attrs.push_back(PAWI); - } } - - ParamAttrsList *PAL = 0; - if (!Attrs.empty()) - PAL = ParamAttrsList::get(Attrs); - - Ty = FunctionType::get($3->get(), ParamTypes, false, PAL); + Ty = FunctionType::get($3->get(), ParamTypes, false); PFTy = PointerType::get(Ty); } @@ -2952,6 +2933,14 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef { theF->getName() + "'"); } + // Set up the ParamAttrs for the function + ParamAttrsVector Attrs; + if ($8 != ParamAttr::None) { + ParamAttrsWithIndex PAWI; + PAWI.index = 0; + PAWI.attrs = $8; + Attrs.push_back(PAWI); + } // Check the arguments ValueList Args; if ($6->empty()) { // Has no arguments? @@ -2961,17 +2950,23 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef { "expects arguments"); } else { // Has arguments? // Loop through FunctionType's arguments and ensure they are specified - // correctly! - // + // correctly. Also, gather any parameter attributes. FunctionType::param_iterator I = Ty->param_begin(); FunctionType::param_iterator E = Ty->param_end(); ParamList::iterator ArgI = $6->begin(), ArgE = $6->end(); + unsigned index = 1; - for (; ArgI != ArgE && I != E; ++ArgI, ++I) { + for (; ArgI != ArgE && I != E; ++ArgI, ++I, ++index) { if (ArgI->Val->getType() != *I) GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" + (*I)->getDescription() + "'"); Args.push_back(ArgI->Val); + if (ArgI->Attrs != ParamAttr::None) { + ParamAttrsWithIndex PAWI; + PAWI.index = index; + PAWI.attrs = ArgI->Attrs; + Attrs.push_back(PAWI); + } } if (Ty->isVarArg()) { if (I == E) @@ -2980,10 +2975,17 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef { } else if (I != E || ArgI != ArgE) GEN_ERROR("Invalid number of parameters detected"); } + + // Finish off the ParamAttrs and check them + ParamAttrsList *PAL = 0; + if (!Attrs.empty()) + PAL = ParamAttrsList::get(Attrs); + // Create the call node CallInst *CI = new CallInst(V, Args.begin(), Args.end()); CI->setTailCall($1); CI->setCallingConv($2); + CI->setParamAttrs(PAL); $$ = CI; delete $6; delete $3; diff --git a/lib/AsmParser/llvmAsmParser.y.cvs b/lib/AsmParser/llvmAsmParser.y.cvs index 3525567cf2c..683b95b8fba 100644 --- a/lib/AsmParser/llvmAsmParser.y.cvs +++ b/lib/AsmParser/llvmAsmParser.y.cvs @@ -29,9 +29,6 @@ #include #include #include -#ifndef NDEBUG -#define YYDEBUG 1 -#endif // The following is a gross hack. In order to rid the libAsmParser library of // exceptions, we have to have a way of getting the yyparse function to go into @@ -51,15 +48,6 @@ static bool TriggerError = false; int yyerror(const char *ErrorMsg); // Forward declarations to prevent "implicit int yylex(); // declaration" of xxx warnings. int yyparse(); - -namespace llvm { - std::string CurFilename; -#if YYDEBUG -static cl::opt -Debug("debug-yacc", cl::desc("Print yacc debug state changes"), - cl::Hidden, cl::init(false)); -#endif -} using namespace llvm; static Module *ParserResult; @@ -513,7 +501,7 @@ static Value *getVal(const Type *Ty, const ValID &ID) { // Remember where this forward reference came from. FIXME, shouldn't we try // to recycle these things?? CurModule.PlaceHolderInfo.insert(std::make_pair(V, std::make_pair(ID, - llvmAsmlineno))); + LLLgetLineNo()))); if (inFunctionScope()) InsertValue(V, CurFun.LateResolveValues); @@ -945,22 +933,11 @@ static PATypeHolder HandleUpRefs(const Type *ty) { // static Module* RunParser(Module * M); -Module *llvm::RunVMAsmParser(const std::string &Filename, FILE *F) { - set_scan_file(F); - - CurFilename = Filename; - return RunParser(new Module(CurFilename)); -} - -Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) { - set_scan_string(AsmString); - - CurFilename = "from_memory"; - if (M == NULL) { - return RunParser(new Module (CurFilename)); - } else { - return RunParser(M); - } +Module *llvm::RunVMAsmParser(llvm::MemoryBuffer *MB) { + InitLLLexer(MB); + Module *M = RunParser(new Module(LLLgetFilename())); + FreeLexer(); + return M; } %} @@ -1113,7 +1090,7 @@ Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) { // Function Attributes %token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS BYVAL NEST -%token CONST PURE +%token READNONE READONLY // Visibility Styles %token DEFAULT HIDDEN PROTECTED @@ -1257,8 +1234,8 @@ FuncAttr : NORETURN { $$ = ParamAttr::NoReturn; } | NOUNWIND { $$ = ParamAttr::NoUnwind; } | ZEROEXT { $$ = ParamAttr::ZExt; } | SIGNEXT { $$ = ParamAttr::SExt; } - | PURE { $$ = ParamAttr::Pure; } - | CONST { $$ = ParamAttr::Const; } + | READNONE { $$ = ParamAttr::ReadNone; } + | READONLY { $$ = ParamAttr::ReadOnly; } ; OptFuncAttrs : /* empty */ { $$ = ParamAttr::None; } @@ -1351,61 +1328,36 @@ Types CHECK_FOR_ERROR } | Types '(' ArgTypeListI ')' OptFuncAttrs { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. std::vector Params; - ParamAttrsVector Attrs; - if ($5 != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = 0; X.attrs = $5; - Attrs.push_back(X); - } - unsigned index = 1; TypeWithAttrsList::iterator I = $3->begin(), E = $3->end(); - for (; I != E; ++I, ++index) { + for (; I != E; ++I ) { const Type *Ty = I->Ty->get(); Params.push_back(Ty); - if (Ty != Type::VoidTy) - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = index; X.attrs = I->Attrs; - Attrs.push_back(X); - } } bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); - ParamAttrsList *ActualAttrs = 0; - if (!Attrs.empty()) - ActualAttrs = ParamAttrsList::get(Attrs); - FunctionType *FT = FunctionType::get(*$1, Params, isVarArg, ActualAttrs); + FunctionType *FT = FunctionType::get(*$1, Params, isVarArg); delete $3; // Delete the argument list delete $1; // Delete the return type handle $$ = new PATypeHolder(HandleUpRefs(FT)); CHECK_FOR_ERROR } | VOID '(' ArgTypeListI ')' OptFuncAttrs { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. std::vector Params; - ParamAttrsVector Attrs; - if ($5 != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = 0; X.attrs = $5; - Attrs.push_back(X); - } TypeWithAttrsList::iterator I = $3->begin(), E = $3->end(); - unsigned index = 1; - for ( ; I != E; ++I, ++index) { + for ( ; I != E; ++I ) { const Type* Ty = I->Ty->get(); Params.push_back(Ty); - if (Ty != Type::VoidTy) - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex X; X.index = index; X.attrs = I->Attrs; - Attrs.push_back(X); - } } bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); - ParamAttrsList *ActualAttrs = 0; - if (!Attrs.empty()) - ActualAttrs = ParamAttrsList::get(Attrs); - - FunctionType *FT = FunctionType::get($1, Params, isVarArg, ActualAttrs); + FunctionType *FT = FunctionType::get($1, Params, isVarArg); delete $3; // Delete the argument list $$ = new PATypeHolder(HandleUpRefs(FT)); CHECK_FOR_ERROR @@ -1457,9 +1409,11 @@ Types ; ArgType - : Types OptParamAttrs { + : Types OptParamAttrs { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. $$.Ty = $1; - $$.Attrs = $2; + $$.Attrs = ParamAttr::None; } ; @@ -2264,7 +2218,9 @@ FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')' std::vector ParamTypeList; ParamAttrsVector Attrs; if ($7 != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = $7; + ParamAttrsWithIndex PAWI; + PAWI.index = 0; + PAWI.attrs = $7; Attrs.push_back(PAWI); } if ($5) { // If there are arguments... @@ -2276,7 +2232,9 @@ FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')' ParamTypeList.push_back(Ty); if (Ty != Type::VoidTy) if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = index; PAWI.attrs = I->Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = index; + PAWI.attrs = I->Attrs; Attrs.push_back(PAWI); } } @@ -2289,7 +2247,7 @@ FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')' if (!Attrs.empty()) PAL = ParamAttrsList::get(Attrs); - FunctionType *FT = FunctionType::get(*$2, ParamTypeList, isVarArg, PAL); + FunctionType *FT = FunctionType::get(*$2, ParamTypeList, isVarArg); const PointerType *PFT = PointerType::get(FT); delete $2; @@ -2306,19 +2264,24 @@ FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')' // Move the function to the end of the list, from whereever it was // previously inserted. Fn = cast(FWRef); + assert(!Fn->getParamAttrs() && "Forward reference has parameter attributes!"); CurModule.CurrentModule->getFunctionList().remove(Fn); CurModule.CurrentModule->getFunctionList().push_back(Fn); } else if (!FunctionName.empty() && // Merge with an earlier prototype? (Fn = CurModule.CurrentModule->getFunction(FunctionName))) { - if (Fn->getFunctionType() != FT) { + if (Fn->getFunctionType() != FT ) { // The existing function doesn't have the same type. This is an overload // error. GEN_ERROR("Overload of function '" + FunctionName + "' not permitted."); + } else if (Fn->getParamAttrs() != PAL) { + // The existing function doesn't have the same parameter attributes. + // This is an overload error. + GEN_ERROR("Overload of function '" + FunctionName + "' not permitted."); } else if (!CurFun.isDeclare && !Fn->isDeclaration()) { // Neither the existing or the current function is a declaration and they // have the same name and same type. Clearly this is a redefinition. GEN_ERROR("Redefinition of function '" + FunctionName + "'"); - } if (Fn->isDeclaration()) { + } else if (Fn->isDeclaration()) { // Make sure to strip off any argument names so we can't get conflicts. for (Function::arg_iterator AI = Fn->arg_begin(), AE = Fn->arg_end(); AI != AE; ++AI) @@ -2327,7 +2290,6 @@ FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')' } else { // Not already defined? Fn = new Function(FT, GlobalValue::ExternalWeakLinkage, FunctionName, CurModule.CurrentModule); - InsertValue(Fn, CurModule.Values); } @@ -2341,6 +2303,7 @@ FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')' Fn->setVisibility(CurFun.Visibility); } Fn->setCallingConv($1); + Fn->setParamAttrs(PAL); Fn->setAlignment($9); if ($8) { Fn->setSection(*$8); @@ -2620,28 +2583,14 @@ BBTerminatorInst : RET ResolvedVal { // Return with a result... !(Ty = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; - ParamAttrsVector Attrs; - if ($8 != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = $8; - Attrs.push_back(PAWI); - } ParamList::iterator I = $6->begin(), E = $6->end(); - unsigned index = 1; - for (; I != E; ++I, ++index) { + for (; I != E; ++I) { const Type *Ty = I->Val->getType(); if (Ty == Type::VoidTy) GEN_ERROR("Short call syntax cannot be used with varargs"); ParamTypes.push_back(Ty); - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = index; PAWI.attrs = I->Attrs; - Attrs.push_back(PAWI); - } } - - ParamAttrsList *PAL = 0; - if (!Attrs.empty()) - PAL = ParamAttrsList::get(Attrs); - Ty = FunctionType::get($3->get(), ParamTypes, false, PAL); + Ty = FunctionType::get($3->get(), ParamTypes, false); PFTy = PointerType::get(Ty); } @@ -2654,6 +2603,12 @@ BBTerminatorInst : RET ResolvedVal { // Return with a result... BasicBlock *Except = getBBVal($14); CHECK_FOR_ERROR + ParamAttrsVector Attrs; + if ($8 != ParamAttr::None) { + ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = $8; + Attrs.push_back(PAWI); + } + // Check the arguments ValueList Args; if ($6->empty()) { // Has no arguments? @@ -2667,12 +2622,19 @@ BBTerminatorInst : RET ResolvedVal { // Return with a result... FunctionType::param_iterator I = Ty->param_begin(); FunctionType::param_iterator E = Ty->param_end(); ParamList::iterator ArgI = $6->begin(), ArgE = $6->end(); + unsigned index = 1; - for (; ArgI != ArgE && I != E; ++ArgI, ++I) { + for (; ArgI != ArgE && I != E; ++ArgI, ++I, ++index) { if (ArgI->Val->getType() != *I) GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" + (*I)->getDescription() + "'"); Args.push_back(ArgI->Val); + if (ArgI->Attrs != ParamAttr::None) { + ParamAttrsWithIndex PAWI; + PAWI.index = index; + PAWI.attrs = ArgI->Attrs; + Attrs.push_back(PAWI); + } } if (Ty->isVarArg()) { @@ -2683,9 +2645,14 @@ BBTerminatorInst : RET ResolvedVal { // Return with a result... GEN_ERROR("Invalid number of parameters detected"); } + ParamAttrsList *PAL = 0; + if (!Attrs.empty()) + PAL = ParamAttrsList::get(Attrs); + // Create the InvokeInst InvokeInst *II = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); II->setCallingConv($2); + II->setParamAttrs(PAL); $$ = II; delete $6; CHECK_FOR_ERROR @@ -2756,33 +2723,39 @@ PHIList : Types '[' ValueRef ',' ValueRef ']' { // Used for PHI nodes }; -ParamList : Types ValueRef OptParamAttrs { +ParamList : Types OptParamAttrs ValueRef OptParamAttrs { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription()); // Used for call and invoke instructions $$ = new ParamList(); - ParamListEntry E; E.Attrs = $3; E.Val = getVal($1->get(), $2); + ParamListEntry E; E.Attrs = $2 | $4; E.Val = getVal($1->get(), $3); $$->push_back(E); delete $1; + CHECK_FOR_ERROR } - | LABEL ValueRef OptParamAttrs { + | LABEL OptParamAttrs ValueRef OptParamAttrs { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 // Labels are only valid in ASMs $$ = new ParamList(); - ParamListEntry E; E.Attrs = $3; E.Val = getBBVal($2); + ParamListEntry E; E.Attrs = $2 | $4; E.Val = getBBVal($3); $$->push_back(E); + CHECK_FOR_ERROR } - | ParamList ',' Types ValueRef OptParamAttrs { + | ParamList ',' Types OptParamAttrs ValueRef OptParamAttrs { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*$3)->getDescription()); $$ = $1; - ParamListEntry E; E.Attrs = $5; E.Val = getVal($3->get(), $4); + ParamListEntry E; E.Attrs = $4 | $6; E.Val = getVal($3->get(), $5); $$->push_back(E); delete $3; CHECK_FOR_ERROR } - | ParamList ',' LABEL ValueRef OptParamAttrs { + | ParamList ',' LABEL OptParamAttrs ValueRef OptParamAttrs { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 $$ = $1; - ParamListEntry E; E.Attrs = $5; E.Val = getBBVal($4); + ParamListEntry E; E.Attrs = $4 | $6; E.Val = getBBVal($5); $$->push_back(E); CHECK_FOR_ERROR } @@ -2937,29 +2910,14 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef { !(Ty = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; - ParamAttrsVector Attrs; - if ($8 != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = $8; - Attrs.push_back(PAWI); - } - unsigned index = 1; ParamList::iterator I = $6->begin(), E = $6->end(); - for (; I != E; ++I, ++index) { + for (; I != E; ++I) { const Type *Ty = I->Val->getType(); if (Ty == Type::VoidTy) GEN_ERROR("Short call syntax cannot be used with varargs"); ParamTypes.push_back(Ty); - if (I->Attrs != ParamAttr::None) { - ParamAttrsWithIndex PAWI; PAWI.index = index; PAWI.attrs = I->Attrs; - Attrs.push_back(PAWI); - } } - - ParamAttrsList *PAL = 0; - if (!Attrs.empty()) - PAL = ParamAttrsList::get(Attrs); - - Ty = FunctionType::get($3->get(), ParamTypes, false, PAL); + Ty = FunctionType::get($3->get(), ParamTypes, false); PFTy = PointerType::get(Ty); } @@ -2975,6 +2933,14 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef { theF->getName() + "'"); } + // Set up the ParamAttrs for the function + ParamAttrsVector Attrs; + if ($8 != ParamAttr::None) { + ParamAttrsWithIndex PAWI; + PAWI.index = 0; + PAWI.attrs = $8; + Attrs.push_back(PAWI); + } // Check the arguments ValueList Args; if ($6->empty()) { // Has no arguments? @@ -2984,17 +2950,23 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef { "expects arguments"); } else { // Has arguments? // Loop through FunctionType's arguments and ensure they are specified - // correctly! - // + // correctly. Also, gather any parameter attributes. FunctionType::param_iterator I = Ty->param_begin(); FunctionType::param_iterator E = Ty->param_end(); ParamList::iterator ArgI = $6->begin(), ArgE = $6->end(); + unsigned index = 1; - for (; ArgI != ArgE && I != E; ++ArgI, ++I) { + for (; ArgI != ArgE && I != E; ++ArgI, ++I, ++index) { if (ArgI->Val->getType() != *I) GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" + (*I)->getDescription() + "'"); Args.push_back(ArgI->Val); + if (ArgI->Attrs != ParamAttr::None) { + ParamAttrsWithIndex PAWI; + PAWI.index = index; + PAWI.attrs = ArgI->Attrs; + Attrs.push_back(PAWI); + } } if (Ty->isVarArg()) { if (I == E) @@ -3003,10 +2975,17 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef { } else if (I != E || ArgI != ArgE) GEN_ERROR("Invalid number of parameters detected"); } + + // Finish off the ParamAttrs and check them + ParamAttrsList *PAL = 0; + if (!Attrs.empty()) + PAL = ParamAttrsList::get(Attrs); + // Create the call node CallInst *CI = new CallInst(V, Args.begin(), Args.end()); CI->setTailCall($1); CI->setCallingConv($2); + CI->setParamAttrs(PAL); $$ = CI; delete $6; delete $3; @@ -3118,13 +3097,7 @@ MemoryInst : MALLOC Types OptCAlign { // common code from the two 'RunVMAsmParser' functions static Module* RunParser(Module * M) { - - llvmAsmlineno = 1; // Reset the current line number... CurModule.CurrentModule = M; -#if YYDEBUG - yydebug = Debug; -#endif - // Check to make sure the parser succeeded if (yyparse()) { if (ParserResult) @@ -3176,21 +3149,21 @@ static Module* RunParser(Module * M) { } void llvm::GenerateError(const std::string &message, int LineNo) { - if (LineNo == -1) LineNo = llvmAsmlineno; + if (LineNo == -1) LineNo = LLLgetLineNo(); // TODO: column number in exception if (TheParseError) - TheParseError->setError(CurFilename, message, LineNo); + TheParseError->setError(LLLgetFilename(), message, LineNo); TriggerError = 1; } int yyerror(const char *ErrorMsg) { - std::string where - = std::string((CurFilename == "-") ? std::string("") : CurFilename) - + ":" + utostr((unsigned) llvmAsmlineno) + ": "; + std::string where = LLLgetFilename() + ":" + utostr(LLLgetLineNo()) + ": "; std::string errMsg = where + "error: " + std::string(ErrorMsg); - if (yychar != YYEMPTY && yychar != 0) - errMsg += " while reading token: '" + std::string(llvmAsmtext, llvmAsmleng)+ - "'"; + if (yychar != YYEMPTY && yychar != 0) { + errMsg += " while reading token: '"; + errMsg += std::string(LLLgetTokenStart(), + LLLgetTokenStart()+LLLgetTokenLength()) + "'"; + } GenerateError(errMsg); return 0; } diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp index 119a583358e..93542f3dad0 100644 --- a/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/lib/Bitcode/Reader/BitcodeReader.cpp @@ -329,15 +329,15 @@ bool BitcodeReader::ParseTypeTable() { ResultTy = PointerType::get(getTypeByID(Record[0], true)); break; case bitc::TYPE_CODE_FUNCTION: { - // FUNCTION: [vararg, attrid, retty, paramty x N] - if (Record.size() < 3) + // FUNCTION: [vararg, retty, paramty x N] + if (Record.size() < 2) return Error("Invalid FUNCTION type record"); std::vector ArgTys; - for (unsigned i = 3, e = Record.size(); i != e; ++i) + for (unsigned i = 2, e = Record.size(); i != e; ++i) ArgTys.push_back(getTypeByID(Record[i], true)); - ResultTy = FunctionType::get(getTypeByID(Record[2], true), ArgTys, - Record[0], getParamAttrs(Record[1])); + ResultTy = FunctionType::get(getTypeByID(Record[1], true), ArgTys, + Record[0]); break; } case bitc::TYPE_CODE_STRUCT: { // STRUCT: [ispacked, eltty x N] @@ -1033,9 +1033,8 @@ bool BitcodeReader::ParseModule(const std::string &ModuleID) { Func->setCallingConv(Record[1]); bool isProto = Record[2]; Func->setLinkage(GetDecodedLinkage(Record[3])); - - assert(Func->getFunctionType()->getParamAttrs() == - getParamAttrs(Record[4])); + const ParamAttrsList *PAL = getParamAttrs(Record[4]); + Func->setParamAttrs(PAL); Func->setAlignment((1 << Record[5]) >> 1); if (Record[6]) { @@ -1360,8 +1359,10 @@ bool BitcodeReader::ParseFunctionBody(Function *F) { break; } - case bitc::FUNC_CODE_INST_INVOKE: { // INVOKE: [cc,fnty, op0,op1,op2, ...] + case bitc::FUNC_CODE_INST_INVOKE: { + // INVOKE: [attrs, cc, normBB, unwindBB, fnty, op0,op1,op2, ...] if (Record.size() < 4) return Error("Invalid INVOKE record"); + const ParamAttrsList *PAL = getParamAttrs(Record[0]); unsigned CCInfo = Record[1]; BasicBlock *NormalBB = getBasicBlock(Record[2]); BasicBlock *UnwindBB = getBasicBlock(Record[3]); @@ -1380,8 +1381,6 @@ bool BitcodeReader::ParseFunctionBody(Function *F) { Record.size() < OpNum+FTy->getNumParams()) return Error("Invalid INVOKE record"); - assert(FTy->getParamAttrs() == getParamAttrs(Record[0])); - SmallVector Ops; for (unsigned i = 0, e = FTy->getNumParams(); i != e; ++i, ++OpNum) { Ops.push_back(getFnValueByID(Record[OpNum], FTy->getParamType(i))); @@ -1403,6 +1402,7 @@ bool BitcodeReader::ParseFunctionBody(Function *F) { I = new InvokeInst(Callee, NormalBB, UnwindBB, Ops.begin(), Ops.end()); cast(I)->setCallingConv(CCInfo); + cast(I)->setParamAttrs(PAL); break; } case bitc::FUNC_CODE_INST_UNWIND: // UNWIND @@ -1482,10 +1482,12 @@ bool BitcodeReader::ParseFunctionBody(Function *F) { I = new StoreInst(Val, Ptr, Record[OpNum+1], (1 << Record[OpNum]) >> 1); break; } - case bitc::FUNC_CODE_INST_CALL: { // CALL: [cc, fnty, fnid, arg0, arg1...] - if (Record.size() < 2) + case bitc::FUNC_CODE_INST_CALL: { + // CALL: [paramattrs, cc, fnty, fnid, arg0, arg1...] + if (Record.size() < 3) return Error("Invalid CALL record"); + const ParamAttrsList *PAL = getParamAttrs(Record[0]); unsigned CCInfo = Record[1]; unsigned OpNum = 2; @@ -1499,8 +1501,6 @@ bool BitcodeReader::ParseFunctionBody(Function *F) { if (!FTy || Record.size() < FTy->getNumParams()+OpNum) return Error("Invalid CALL record"); - assert(FTy->getParamAttrs() == getParamAttrs(Record[0])); - SmallVector Args; // Read the fixed params. for (unsigned i = 0, e = FTy->getNumParams(); i != e; ++i, ++OpNum) { @@ -1527,6 +1527,7 @@ bool BitcodeReader::ParseFunctionBody(Function *F) { I = new CallInst(Callee, Args.begin(), Args.end()); cast(I)->setCallingConv(CCInfo>>1); cast(I)->setTailCall(CCInfo & 1); + cast(I)->setParamAttrs(PAL); break; } case bitc::FUNC_CODE_INST_VAARG: { // VAARG: [valistty, valist, instty] diff --git a/lib/Bitcode/Writer/BitcodeWriter.cpp b/lib/Bitcode/Writer/BitcodeWriter.cpp index 6bf27123c96..9249c70209f 100644 --- a/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -147,8 +147,6 @@ static void WriteTypeTable(const ValueEnumerator &VE, BitstreamWriter &Stream) { Abbv = new BitCodeAbbrev(); Abbv->Add(BitCodeAbbrevOp(bitc::TYPE_CODE_FUNCTION)); Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 1)); // isvararg - Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, - Log2_32_Ceil(VE.getParamAttrs().size()+1))); Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Array)); Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, Log2_32_Ceil(VE.getTypes().size()+1))); @@ -206,10 +204,9 @@ static void WriteTypeTable(const ValueEnumerator &VE, BitstreamWriter &Stream) { case Type::FunctionTyID: { const FunctionType *FT = cast(T); - // FUNCTION: [isvararg, attrid, retty, paramty x N] + // FUNCTION: [isvararg, retty, paramty x N] Code = bitc::TYPE_CODE_FUNCTION; TypeVals.push_back(FT->isVarArg()); - TypeVals.push_back(VE.getParamAttrID(FT->getParamAttrs())); TypeVals.push_back(VE.getTypeID(FT->getReturnType())); for (unsigned i = 0, e = FT->getNumParams(); i != e; ++i) TypeVals.push_back(VE.getTypeID(FT->getParamType(i))); @@ -383,18 +380,13 @@ static void WriteModuleInfo(const Module *M, const ValueEnumerator &VE, // Emit the function proto information. for (Module::const_iterator F = M->begin(), E = M->end(); F != E; ++F) { - // FUNCTION: [type, callingconv, isproto, linkage, alignment, section, - // visibility] + // FUNCTION: [type, callingconv, isproto, paramattr, + // linkage, alignment, section, visibility] Vals.push_back(VE.getTypeID(F->getType())); Vals.push_back(F->getCallingConv()); Vals.push_back(F->isDeclaration()); Vals.push_back(getEncodedLinkage(F)); - - // Note: we emit the param attr ID number for the function type of this - // function. In the future, we intend for attrs to be properties of - // functions, instead of on the type. This is to support this future work. - Vals.push_back(VE.getParamAttrID(F->getFunctionType()->getParamAttrs())); - + Vals.push_back(VE.getParamAttrID(F->getParamAttrs())); Vals.push_back(Log2_32(F->getAlignment())+1); Vals.push_back(F->hasSection() ? SectionMap[F->getSection()] : 0); Vals.push_back(getEncodedVisibility(F)); @@ -760,12 +752,9 @@ static void WriteInstruction(const Instruction &I, unsigned InstID, const FunctionType *FTy = cast(PTy->getElementType()); Code = bitc::FUNC_CODE_INST_INVOKE; - // Note: we emit the param attr ID number for the function type of this - // function. In the future, we intend for attrs to be properties of - // functions, instead of on the type. This is to support this future work. - Vals.push_back(VE.getParamAttrID(FTy->getParamAttrs())); - - Vals.push_back(cast(I).getCallingConv()); + const InvokeInst *II = cast(&I); + Vals.push_back(VE.getParamAttrID(II->getParamAttrs())); + Vals.push_back(II->getCallingConv()); Vals.push_back(VE.getValueID(I.getOperand(1))); // normal dest Vals.push_back(VE.getValueID(I.getOperand(2))); // unwind dest PushValueAndType(I.getOperand(0), InstID, Vals, VE); // callee @@ -837,14 +826,10 @@ static void WriteInstruction(const Instruction &I, unsigned InstID, Code = bitc::FUNC_CODE_INST_CALL; - // Note: we emit the param attr ID number for the function type of this - // function. In the future, we intend for attrs to be properties of - // functions, instead of on the type. This is to support this future work. - Vals.push_back(VE.getParamAttrID(FTy->getParamAttrs())); - - Vals.push_back((cast(I).getCallingConv() << 1) | - unsigned(cast(I).isTailCall())); - PushValueAndType(I.getOperand(0), InstID, Vals, VE); // Callee + const CallInst *CI = cast(&I); + Vals.push_back(VE.getParamAttrID(CI->getParamAttrs())); + Vals.push_back((CI->getCallingConv() << 1) | unsigned(CI->isTailCall())); + PushValueAndType(CI->getOperand(0), InstID, Vals, VE); // Callee // Emit value #'s for the fixed parameters. for (unsigned i = 0, e = FTy->getNumParams(); i != e; ++i) diff --git a/lib/Bitcode/Writer/ValueEnumerator.cpp b/lib/Bitcode/Writer/ValueEnumerator.cpp index 6b3885ed1c7..21b03725ff9 100644 --- a/lib/Bitcode/Writer/ValueEnumerator.cpp +++ b/lib/Bitcode/Writer/ValueEnumerator.cpp @@ -17,6 +17,7 @@ #include "llvm/Module.h" #include "llvm/TypeSymbolTable.h" #include "llvm/ValueSymbolTable.h" +#include "llvm/Instructions.h" #include using namespace llvm; @@ -44,8 +45,10 @@ ValueEnumerator::ValueEnumerator(const Module *M) { EnumerateValue(I); // Enumerate the functions. - for (Module::const_iterator I = M->begin(), E = M->end(); I != E; ++I) + for (Module::const_iterator I = M->begin(), E = M->end(); I != E; ++I) { EnumerateValue(I); + EnumerateParamAttrs(cast(I)->getParamAttrs()); + } // Enumerate the aliases. for (Module::const_alias_iterator I = M->alias_begin(), E = M->alias_end(); @@ -86,6 +89,10 @@ ValueEnumerator::ValueEnumerator(const Module *M) { OI != E; ++OI) EnumerateOperandType(*OI); EnumerateType(I->getType()); + if (const CallInst *CI = dyn_cast(I)) + EnumerateParamAttrs(CI->getParamAttrs()); + else if (const InvokeInst *II = dyn_cast(I)) + EnumerateParamAttrs(II->getParamAttrs()); } } @@ -220,10 +227,6 @@ void ValueEnumerator::EnumerateType(const Type *Ty) { for (Type::subtype_iterator I = Ty->subtype_begin(), E = Ty->subtype_end(); I != E; ++I) EnumerateType(*I); - - // If this is a function type, enumerate the param attrs. - if (const FunctionType *FTy = dyn_cast(Ty)) - EnumerateParamAttrs(FTy->getParamAttrs()); } // Enumerate the types for the specified value. If the value is a constant, @@ -296,6 +299,10 @@ void ValueEnumerator::incorporateFunction(const Function &F) { // Optimize the constant layout. OptimizeConstants(FirstFuncConstantID, Values.size()); + // Add the function's parameter attributes so they are available for use in + // the function's instruction. + EnumerateParamAttrs(F.getParamAttrs()); + FirstInstID = Values.size(); // Add all of the instructions. diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index 270c9a958f2..3ba886f05da 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -499,11 +499,11 @@ public: unsigned Opc); bool isExportableFromCurrentBlock(Value *V, const BasicBlock *FromBB); void ExportFromCurrentBlock(Value *V); - void LowerCallTo(Instruction &I, - const Type *CalledValueTy, unsigned CallingConv, + void LowerCallTo(Instruction &I, const Type *CalledValueTy, + const ParamAttrsList *PAL, unsigned CallingConv, bool IsTailCall, SDOperand Callee, unsigned OpIdx, MachineBasicBlock *LandingPad = NULL); - + // Terminator instructions. void visitRet(ReturnInst &I); void visitBr(BranchInst &I); @@ -934,12 +934,11 @@ void SelectionDAGLowering::visitRet(ReturnInst &I) { TmpVT = TLI.getTypeToTransformTo(MVT::i32); else TmpVT = MVT::i32; - const FunctionType *FTy = I.getParent()->getParent()->getFunctionType(); - const ParamAttrsList *Attrs = FTy->getParamAttrs(); + const ParamAttrsList *PAL = I.getParent()->getParent()->getParamAttrs(); ISD::NodeType ExtendKind = ISD::ANY_EXTEND; - if (Attrs && Attrs->paramHasAttr(0, ParamAttr::SExt)) + if (PAL && PAL->paramHasAttr(0, ParamAttr::SExt)) ExtendKind = ISD::SIGN_EXTEND; - if (Attrs && Attrs->paramHasAttr(0, ParamAttr::ZExt)) + if (PAL && PAL->paramHasAttr(0, ParamAttr::ZExt)) ExtendKind = ISD::ZERO_EXTEND; RetOp = DAG.getNode(ExtendKind, TmpVT, RetOp); NewValues.push_back(RetOp); @@ -1450,7 +1449,7 @@ void SelectionDAGLowering::visitInvoke(InvokeInst &I) { MachineBasicBlock *Return = FuncInfo.MBBMap[I.getSuccessor(0)]; MachineBasicBlock *LandingPad = FuncInfo.MBBMap[I.getSuccessor(1)]; - LowerCallTo(I, I.getCalledValue()->getType(), + LowerCallTo(I, I.getCalledValue()->getType(), I.getParamAttrs(), I.getCallingConv(), false, getValue(I.getOperand(0)), @@ -2940,13 +2939,13 @@ SelectionDAGLowering::visitIntrinsicCall(CallInst &I, unsigned Intrinsic) { void SelectionDAGLowering::LowerCallTo(Instruction &I, const Type *CalledValueTy, + const ParamAttrsList *Attrs, unsigned CallingConv, bool IsTailCall, SDOperand Callee, unsigned OpIdx, MachineBasicBlock *LandingPad) { const PointerType *PT = cast(CalledValueTy); const FunctionType *FTy = cast(PT->getElementType()); - const ParamAttrsList *Attrs = FTy->getParamAttrs(); MachineModuleInfo *MMI = DAG.getMachineModuleInfo(); unsigned BeginLabel = 0, EndLabel = 0; @@ -3073,7 +3072,7 @@ void SelectionDAGLowering::visitCall(CallInst &I) { else Callee = DAG.getExternalSymbol(RenameFn, TLI.getPointerTy()); - LowerCallTo(I, I.getCalledValue()->getType(), + LowerCallTo(I, I.getCalledValue()->getType(), I.getParamAttrs(), I.getCallingConv(), I.isTailCall(), Callee, @@ -3893,8 +3892,7 @@ void SelectionDAGLowering::visitVACopy(CallInst &I) { /// integrated into SDISel. std::vector TargetLowering::LowerArguments(Function &F, SelectionDAG &DAG) { - const FunctionType *FTy = F.getFunctionType(); - const ParamAttrsList *Attrs = FTy->getParamAttrs(); + const ParamAttrsList *Attrs = F.getParamAttrs(); // Add CC# and isVararg as operands to the FORMAL_ARGUMENTS node. std::vector Ops; Ops.push_back(DAG.getRoot()); diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index 0504580ddbb..0f2afe54c97 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -358,6 +358,7 @@ static void CopyGVAttributes(GlobalValue *DestGV, const GlobalValue *SrcGV) { if (const Function *SrcF = dyn_cast(SrcGV)) { Function *DestF = cast(DestGV); DestF->setCallingConv(SrcF->getCallingConv()); + DestF->setParamAttrs(SrcF->getParamAttrs()); } } diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp index f874a182f08..852e28df874 100644 --- a/lib/Target/CBackend/CBackend.cpp +++ b/lib/Target/CBackend/CBackend.cpp @@ -126,12 +126,14 @@ namespace { std::ostream &printType(std::ostream &Out, const Type *Ty, bool isSigned = false, const std::string &VariableName = "", - bool IgnoreName = false); + bool IgnoreName = false, + const ParamAttrsList *PAL = 0); std::ostream &printSimpleType(std::ostream &Out, const Type *Ty, bool isSigned, const std::string &NameSoFar = ""); void printStructReturnPointerFunctionType(std::ostream &Out, + const ParamAttrsList *PAL, const PointerType *Ty); void writeOperand(Value *Operand); @@ -353,6 +355,7 @@ bool CBackendNameAllUsedStructsAndMergeFunctions::runOnModule(Module &M) { /// return type, except, instead of printing the type as void (*)(Struct*, ...) /// print it as "Struct (*)(...)", for struct return functions. void CWriter::printStructReturnPointerFunctionType(std::ostream &Out, + const ParamAttrsList *PAL, const PointerType *TheTy) { const FunctionType *FTy = cast(TheTy->getElementType()); std::stringstream FunctionInnards; @@ -362,12 +365,11 @@ void CWriter::printStructReturnPointerFunctionType(std::ostream &Out, FunctionType::param_iterator I = FTy->param_begin(), E = FTy->param_end(); const Type *RetTy = cast(I->get())->getElementType(); unsigned Idx = 1; - const ParamAttrsList *Attrs = FTy->getParamAttrs(); for (++I; I != E; ++I) { if (PrintedType) FunctionInnards << ", "; printType(FunctionInnards, *I, - /*isSigned=*/Attrs && Attrs->paramHasAttr(Idx, ParamAttr::SExt), ""); + /*isSigned=*/PAL && PAL->paramHasAttr(Idx, ParamAttr::SExt), ""); PrintedType = true; } if (FTy->isVarArg()) { @@ -379,7 +381,7 @@ void CWriter::printStructReturnPointerFunctionType(std::ostream &Out, FunctionInnards << ')'; std::string tstr = FunctionInnards.str(); printType(Out, RetTy, - /*isSigned=*/Attrs && Attrs->paramHasAttr(0, ParamAttr::SExt), tstr); + /*isSigned=*/PAL && PAL->paramHasAttr(0, ParamAttr::SExt), tstr); } std::ostream & @@ -422,7 +424,7 @@ CWriter::printSimpleType(std::ostream &Out, const Type *Ty, bool isSigned, // std::ostream &CWriter::printType(std::ostream &Out, const Type *Ty, bool isSigned, const std::string &NameSoFar, - bool IgnoreName) { + bool IgnoreName, const ParamAttrsList* PAL) { if (Ty->isPrimitiveType() || Ty->isInteger()) { printSimpleType(Out, Ty, isSigned, NameSoFar); return Out; @@ -439,14 +441,13 @@ std::ostream &CWriter::printType(std::ostream &Out, const Type *Ty, const FunctionType *FTy = cast(Ty); std::stringstream FunctionInnards; FunctionInnards << " (" << NameSoFar << ") ("; - const ParamAttrsList *Attrs = FTy->getParamAttrs(); unsigned Idx = 1; for (FunctionType::param_iterator I = FTy->param_begin(), E = FTy->param_end(); I != E; ++I) { if (I != FTy->param_begin()) FunctionInnards << ", "; - printType(FunctionInnards, *I, - /*isSigned=*/Attrs && Attrs->paramHasAttr(Idx, ParamAttr::SExt), ""); + printType(FunctionInnards, *I, + /*isSigned=*/PAL && PAL->paramHasAttr(Idx, ParamAttr::SExt), ""); ++Idx; } if (FTy->isVarArg()) { @@ -458,7 +459,7 @@ std::ostream &CWriter::printType(std::ostream &Out, const Type *Ty, FunctionInnards << ')'; std::string tstr = FunctionInnards.str(); printType(Out, FTy->getReturnType(), - /*isSigned=*/Attrs && Attrs->paramHasAttr(0, ParamAttr::SExt), tstr); + /*isSigned=*/PAL && PAL->paramHasAttr(0, ParamAttr::SExt), tstr); return Out; } case Type::StructTyID: { @@ -1836,7 +1837,7 @@ void CWriter::printContainedStructs(const Type *Ty, void CWriter::printFunctionSignature(const Function *F, bool Prototype) { /// isStructReturn - Should this function actually return a struct by-value? - bool isStructReturn = F->getFunctionType()->isStructReturn(); + bool isStructReturn = F->isStructReturn(); if (F->hasInternalLinkage()) Out << "static "; if (F->hasDLLImportLinkage()) Out << "__declspec(dllimport) "; @@ -1852,7 +1853,7 @@ void CWriter::printFunctionSignature(const Function *F, bool Prototype) { // Loop over the arguments, printing them... const FunctionType *FT = cast(F->getFunctionType()); - const ParamAttrsList *Attrs = FT->getParamAttrs(); + const ParamAttrsList *PAL = F->getParamAttrs(); std::stringstream FunctionInnards; @@ -1880,7 +1881,7 @@ void CWriter::printFunctionSignature(const Function *F, bool Prototype) { else ArgName = ""; printType(FunctionInnards, I->getType(), - /*isSigned=*/Attrs && Attrs->paramHasAttr(Idx, ParamAttr::SExt), + /*isSigned=*/PAL && PAL->paramHasAttr(Idx, ParamAttr::SExt), ArgName); PrintedArg = true; ++Idx; @@ -1901,7 +1902,7 @@ void CWriter::printFunctionSignature(const Function *F, bool Prototype) { for (; I != E; ++I) { if (PrintedArg) FunctionInnards << ", "; printType(FunctionInnards, *I, - /*isSigned=*/Attrs && Attrs->paramHasAttr(Idx, ParamAttr::SExt)); + /*isSigned=*/PAL && PAL->paramHasAttr(Idx, ParamAttr::SExt)); PrintedArg = true; ++Idx; } @@ -1929,7 +1930,7 @@ void CWriter::printFunctionSignature(const Function *F, bool Prototype) { // Print out the return type and the signature built above. printType(Out, RetTy, - /*isSigned=*/ Attrs && Attrs->paramHasAttr(0, ParamAttr::SExt), + /*isSigned=*/ PAL && PAL->paramHasAttr(0, ParamAttr::SExt), FunctionInnards.str()); } @@ -1944,7 +1945,7 @@ static inline bool isFPIntBitCast(const Instruction &I) { void CWriter::printFunction(Function &F) { /// isStructReturn - Should this function actually return a struct by-value? - bool isStructReturn = F.getFunctionType()->isStructReturn(); + bool isStructReturn = F.isStructReturn(); printFunctionSignature(&F, false); Out << " {\n"; @@ -2068,8 +2069,7 @@ void CWriter::printBasicBlock(BasicBlock *BB) { // void CWriter::visitReturnInst(ReturnInst &I) { // If this is a struct return function, return the temporary struct. - bool isStructReturn = I.getParent()->getParent()-> - getFunctionType()->isStructReturn(); + bool isStructReturn = I.getParent()->getParent()->isStructReturn(); if (isStructReturn) { Out << " return StructReturn;\n"; @@ -2594,7 +2594,8 @@ void CWriter::visitCallInst(CallInst &I) { // If this is a call to a struct-return function, assign to the first // parameter instead of passing it to the call. - bool isStructRet = FTy->isStructReturn(); + const ParamAttrsList *PAL = I.getParamAttrs(); + bool isStructRet = I.isStructReturn(); if (isStructRet) { Out << "*("; writeOperand(I.getOperand(1)); @@ -2633,7 +2634,7 @@ void CWriter::visitCallInst(CallInst &I) { if (!isStructRet) printType(Out, I.getCalledValue()->getType()); else - printStructReturnPointerFunctionType(Out, + printStructReturnPointerFunctionType(Out, PAL, cast(I.getCalledValue()->getType())); Out << ")(void*)"; } @@ -2652,7 +2653,6 @@ void CWriter::visitCallInst(CallInst &I) { ++ArgNo; } - const ParamAttrsList *Attrs = FTy->getParamAttrs(); bool PrintedArg = false; unsigned Idx = 1; for (; AI != AE; ++AI, ++ArgNo, ++Idx) { @@ -2661,7 +2661,7 @@ void CWriter::visitCallInst(CallInst &I) { (*AI)->getType() != FTy->getParamType(ArgNo)) { Out << '('; printType(Out, FTy->getParamType(ArgNo), - /*isSigned=*/Attrs && Attrs->paramHasAttr(Idx, ParamAttr::SExt)); + /*isSigned=*/PAL && PAL->paramHasAttr(Idx, ParamAttr::SExt)); Out << ')'; } writeOperand(*AI); diff --git a/lib/Target/MSIL/MSILWriter.cpp b/lib/Target/MSIL/MSILWriter.cpp index b31658845f5..2fe4f3b15dc 100644 --- a/lib/Target/MSIL/MSILWriter.cpp +++ b/lib/Target/MSIL/MSILWriter.cpp @@ -1387,8 +1387,7 @@ void MSILWriter::printStaticInitializerList() { void MSILWriter::printFunction(const Function& F) { - const FunctionType* FTy = F.getFunctionType(); - const ParamAttrsList *Attrs = FTy->getParamAttrs(); + const ParamAttrsList *Attrs = F.getParamAttrs(); bool isSigned = Attrs && Attrs->paramHasAttr(0, ParamAttr::SExt); Out << "\n.method static "; Out << (F.hasInternalLinkage() ? "private " : "public "); diff --git a/lib/Target/X86/X86AsmPrinter.cpp b/lib/Target/X86/X86AsmPrinter.cpp index 31e50102864..1625e4c3bd5 100644 --- a/lib/Target/X86/X86AsmPrinter.cpp +++ b/lib/Target/X86/X86AsmPrinter.cpp @@ -93,13 +93,13 @@ void X86SharedAsmPrinter::decorateName(std::string &Name, case StdCall: // "Pure" variadic functions do not receive @0 suffix. if (!FT->isVarArg() || (FT->getNumParams() == 0) || - (FT->getNumParams() == 1 && FT->isStructReturn())) + (FT->getNumParams() == 1 && F->isStructReturn())) Name += '@' + utostr_32(Info->getBytesToPopOnReturn()); break; case FastCall: // "Pure" variadic functions do not receive @0 suffix. if (!FT->isVarArg() || (FT->getNumParams() == 0) || - (FT->getNumParams() == 1 && FT->isStructReturn())) + (FT->getNumParams() == 1 && F->isStructReturn())) Name += '@' + utostr_32(Info->getBytesToPopOnReturn()); if (Name[0] == '_') { diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp index 3fcae95e459..505c3028165 100644 --- a/lib/Target/X86/X86ISelLowering.cpp +++ b/lib/Target/X86/X86ISelLowering.cpp @@ -4927,7 +4927,7 @@ SDOperand X86TargetLowering::LowerTRAMPOLINE(SDOperand Op, // Check that ECX wasn't needed by an 'inreg' parameter. const FunctionType *FTy = Func->getFunctionType(); - const ParamAttrsList *Attrs = FTy->getParamAttrs(); + const ParamAttrsList *Attrs = Func->getParamAttrs(); if (Attrs && !Func->isVarArg()) { unsigned InRegCount = 0; diff --git a/lib/Transforms/IPO/ArgumentPromotion.cpp b/lib/Transforms/IPO/ArgumentPromotion.cpp index 7479c8ee674..26d8853891e 100644 --- a/lib/Transforms/IPO/ArgumentPromotion.cpp +++ b/lib/Transforms/IPO/ArgumentPromotion.cpp @@ -35,6 +35,7 @@ #include "llvm/Module.h" #include "llvm/CallGraphSCCPass.h" #include "llvm/Instructions.h" +#include "llvm/ParameterAttributes.h" #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Analysis/CallGraph.h" #include "llvm/Target/TargetData.h" @@ -139,10 +140,10 @@ bool ArgPromotion::PromoteArguments(CallGraphNode *CGN) { // No promotable pointer arguments. if (PointerArgs.empty()) return false; - // Okay, promote all of the arguments are rewrite the callees! + // Okay, promote all of the arguments and rewrite the callees! Function *NewF = DoPromotion(F, PointerArgs); - // Update the call graph to know that the old function is gone. + // Update the call graph to know that the function has been transformed. getAnalysis().changeFunction(F, NewF); return true; } @@ -349,9 +350,23 @@ Function *ArgPromotion::DoPromotion(Function *F, // what the new GEP/Load instructions we are inserting look like. std::map, LoadInst*> OriginalLoads; - for (Function::arg_iterator I = F->arg_begin(), E = F->arg_end(); I != E; ++I) + // ParamAttrs - Keep track of the parameter attributes for the arguments + // that we are *not* promoting. For the ones that we do promote, the parameter + // attributes are lost + ParamAttrsVector ParamAttrsVec; + const ParamAttrsList *PAL = F->getParamAttrs(); + + unsigned index = 1; + for (Function::arg_iterator I = F->arg_begin(), E = F->arg_end(); I != E; + ++I, ++index) if (!ArgsToPromote.count(I)) { Params.push_back(I->getType()); + if (PAL) { + unsigned attrs = PAL->getParamAttrs(index); + if (attrs) + ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Params.size(), + attrs)); + } } else if (I->use_empty()) { ++NumArgumentsDead; } else { @@ -387,6 +402,13 @@ Function *ArgPromotion::DoPromotion(Function *F, const Type *RetTy = FTy->getReturnType(); + // Recompute the parameter attributes list based on the new arguments for + // the function. + if (ParamAttrsVec.empty()) + PAL = 0; + else + PAL = ParamAttrsList::get(ParamAttrsVec); + // Work around LLVM bug PR56: the CWriter cannot emit varargs functions which // have zero fixed arguments. bool ExtraArgHack = false; @@ -394,11 +416,14 @@ Function *ArgPromotion::DoPromotion(Function *F, ExtraArgHack = true; Params.push_back(Type::Int32Ty); } + + // Construct the new function type using the new arguments. FunctionType *NFTy = FunctionType::get(RetTy, Params, FTy->isVarArg()); - // Create the new function body and insert it into the module... + // Create the new function body and insert it into the module... Function *NF = new Function(NFTy, F->getLinkage(), F->getName()); NF->setCallingConv(F->getCallingConv()); + NF->setParamAttrs(PAL); F->getParent()->getFunctionList().insert(F, NF); // Get the alias analysis information that we need to update to reflect our @@ -449,9 +474,11 @@ Function *ArgPromotion::DoPromotion(Function *F, New = new InvokeInst(NF, II->getNormalDest(), II->getUnwindDest(), Args.begin(), Args.end(), "", Call); cast(New)->setCallingConv(CS.getCallingConv()); + cast(New)->setParamAttrs(PAL); } else { New = new CallInst(NF, Args.begin(), Args.end(), "", Call); cast(New)->setCallingConv(CS.getCallingConv()); + cast(New)->setParamAttrs(PAL); if (cast(Call)->isTailCall()) cast(New)->setTailCall(); } diff --git a/lib/Transforms/IPO/DeadArgumentElimination.cpp b/lib/Transforms/IPO/DeadArgumentElimination.cpp index 3d345eefaa1..a76a43a20ba 100644 --- a/lib/Transforms/IPO/DeadArgumentElimination.cpp +++ b/lib/Transforms/IPO/DeadArgumentElimination.cpp @@ -26,6 +26,7 @@ #include "llvm/IntrinsicInst.h" #include "llvm/Module.h" #include "llvm/Pass.h" +#include "llvm/ParameterAttributes.h" #include "llvm/Support/CallSite.h" #include "llvm/Support/Debug.h" #include "llvm/ADT/Statistic.h" @@ -157,6 +158,7 @@ bool DAE::DeleteDeadVarargs(Function &Fn) { // Create the new function body and insert it into the module... Function *NF = new Function(NFTy, Fn.getLinkage()); NF->setCallingConv(Fn.getCallingConv()); + NF->setParamAttrs(Fn.getParamAttrs()); Fn.getParent()->getFunctionList().insert(&Fn, NF); NF->takeName(&Fn); @@ -176,9 +178,11 @@ bool DAE::DeleteDeadVarargs(Function &Fn) { New = new InvokeInst(NF, II->getNormalDest(), II->getUnwindDest(), Args.begin(), Args.end(), "", Call); cast(New)->setCallingConv(CS.getCallingConv()); + cast(New)->setParamAttrs(NF->getParamAttrs()); } else { New = new CallInst(NF, Args.begin(), Args.end(), "", Call); cast(New)->setCallingConv(CS.getCallingConv()); + cast(New)->setParamAttrs(NF->getParamAttrs()); if (cast(Call)->isTailCall()) cast(New)->setTailCall(); } @@ -233,10 +237,10 @@ static inline bool CallPassesValueThoughVararg(Instruction *Call, // (used in a computation), MaybeLive (only passed as an argument to a call), or // Dead (not used). DAE::Liveness DAE::getArgumentLiveness(const Argument &A) { - const FunctionType *FTy = A.getParent()->getFunctionType(); + const Function *F = A.getParent(); // If this is the return value of a struct function, it's not really dead. - if (FTy->isStructReturn() && &*A.getParent()->arg_begin() == &A) + if (F->isStructReturn() && &*(F->arg_begin()) == &A) return Live; if (A.use_empty()) // First check, directly dead? @@ -488,10 +492,32 @@ void DAE::RemoveDeadArgumentsFromFunction(Function *F) { const FunctionType *FTy = F->getFunctionType(); std::vector Params; - for (Function::arg_iterator I = F->arg_begin(), E = F->arg_end(); I != E; ++I) - if (!DeadArguments.count(I)) + // Set up to build a new list of parameter attributes + ParamAttrsVector ParamAttrsVec; + const ParamAttrsList *PAL = F->getParamAttrs(); + + // Construct the new parameter list from non-dead arguments. Also construct + // a new set of parameter attributes to correspond. + unsigned index = 1; + for (Function::arg_iterator I = F->arg_begin(), E = F->arg_end(); I != E; + ++I, ++index) + if (!DeadArguments.count(I)) { Params.push_back(I->getType()); + if (PAL) { + uint16_t Attrs = PAL->getParamAttrs(index); + if (Attrs != ParamAttr::None) + ParamAttrsVec.push_back(ParamAttrsWithIndex::get(Params.size(), + Attrs)); + } + } + + // Reconstruct the ParamAttrsList based on the vector we constructed. + if (ParamAttrsVec.empty()) + PAL = 0; + else + PAL = ParamAttrsList::get(ParamAttrsVec); + // Make the function return void if the return value is dead. const Type *RetTy = FTy->getReturnType(); if (DeadRetVal.count(F)) { RetTy = Type::VoidTy; @@ -507,11 +533,13 @@ void DAE::RemoveDeadArgumentsFromFunction(Function *F) { Params.push_back(Type::Int32Ty); } + // Create the new function type based on the recomputed parameters. FunctionType *NFTy = FunctionType::get(RetTy, Params, FTy->isVarArg()); // Create the new function body and insert it into the module... Function *NF = new Function(NFTy, F->getLinkage()); NF->setCallingConv(F->getCallingConv()); + NF->setParamAttrs(PAL); F->getParent()->getFunctionList().insert(F, NF); NF->takeName(F); @@ -542,9 +570,11 @@ void DAE::RemoveDeadArgumentsFromFunction(Function *F) { New = new InvokeInst(NF, II->getNormalDest(), II->getUnwindDest(), Args.begin(), Args.end(), "", Call); cast(New)->setCallingConv(CS.getCallingConv()); + cast(New)->setParamAttrs(PAL); } else { New = new CallInst(NF, Args.begin(), Args.end(), "", Call); cast(New)->setCallingConv(CS.getCallingConv()); + cast(New)->setParamAttrs(PAL); if (cast(Call)->isTailCall()) cast(New)->setTailCall(); } diff --git a/lib/Transforms/IPO/ExtractFunction.cpp b/lib/Transforms/IPO/ExtractFunction.cpp index ed22465f890..e5b2d41d528 100644 --- a/lib/Transforms/IPO/ExtractFunction.cpp +++ b/lib/Transforms/IPO/ExtractFunction.cpp @@ -95,6 +95,7 @@ namespace { Function *New = new Function(I->getFunctionType(), GlobalValue::ExternalLinkage); New->setCallingConv(I->getCallingConv()); + New->setParamAttrs(I->getParamAttrs()); // If it's not the named function, delete the body of the function I->dropAllReferences(); diff --git a/lib/Transforms/IPO/LowerSetJmp.cpp b/lib/Transforms/IPO/LowerSetJmp.cpp index dbc3199162a..90ece1799da 100644 --- a/lib/Transforms/IPO/LowerSetJmp.cpp +++ b/lib/Transforms/IPO/LowerSetJmp.cpp @@ -476,6 +476,8 @@ void LowerSetJmp::visitCallInst(CallInst& CI) InvokeInst* II = new InvokeInst(CI.getCalledValue(), NewBB, PrelimBBMap[Func], Params.begin(), Params.end(), CI.getName(), Term); + II->setCallingConv(CI.getCallingConv()); + II->setParamAttrs(CI.getParamAttrs()); // Replace the old call inst with the invoke inst and remove the call. CI.replaceAllUsesWith(II); diff --git a/lib/Transforms/IPO/PruneEH.cpp b/lib/Transforms/IPO/PruneEH.cpp index 52f8d5efbf7..631b5f797a2 100644 --- a/lib/Transforms/IPO/PruneEH.cpp +++ b/lib/Transforms/IPO/PruneEH.cpp @@ -156,6 +156,7 @@ bool PruneEH::SimplifyFunction(Function *F) { Args.begin(), Args.end(), "", II); Call->takeName(II); Call->setCallingConv(II->getCallingConv()); + Call->setParamAttrs(II->getParamAttrs()); // Anything that used the value produced by the invoke instruction // now uses the value produced by the call instruction. diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp index e90d1909ae4..52c66a5d87c 100644 --- a/lib/Transforms/Scalar/InstructionCombining.cpp +++ b/lib/Transforms/Scalar/InstructionCombining.cpp @@ -7994,13 +7994,15 @@ bool InstCombiner::transformConstExprCastCall(CallSite CS) { const FunctionType *FT = Callee->getFunctionType(); const Type *OldRetTy = Caller->getType(); - const FunctionType *ActualFT = - cast(cast(CE->getType())->getElementType()); - + const ParamAttrsList* CallerPAL = 0; + if (CallInst *CallerCI = dyn_cast(Caller)) + CallerPAL = CallerCI->getParamAttrs(); + else if (InvokeInst *CallerII = dyn_cast(Caller)) + CallerPAL = CallerII->getParamAttrs(); + // If the parameter attributes are not compatible, don't do the xform. We // don't want to lose an sret attribute or something. - if (!ParamAttrsList::areCompatible(FT->getParamAttrs(), - ActualFT->getParamAttrs())) + if (!ParamAttrsList::areCompatible(CallerPAL, Callee->getParamAttrs())) return false; // Check to see if we are changing the return type... @@ -8135,12 +8137,15 @@ bool InstCombiner::transformConstExprCastCall(CallSite CS) { NC = new InvokeInst(Callee, II->getNormalDest(), II->getUnwindDest(), Args.begin(), Args.end(), Caller->getName(), Caller); cast(NC)->setCallingConv(II->getCallingConv()); + cast(NC)->setParamAttrs(CallerPAL); } else { NC = new CallInst(Callee, Args.begin(), Args.end(), Caller->getName(), Caller); - if (cast(Caller)->isTailCall()) + CallInst *CI = cast(Caller); + if (CI->isTailCall()) cast(NC)->setTailCall(); - cast(NC)->setCallingConv(cast(Caller)->getCallingConv()); + cast(NC)->setCallingConv(CI->getCallingConv()); + cast(NC)->setParamAttrs(CallerPAL); } // Insert a cast of the return type as necessary. @@ -8191,7 +8196,7 @@ Instruction *InstCombiner::transformCallThroughTrampoline(CallSite CS) { const PointerType *NestFPTy = cast(NestF->getType()); const FunctionType *NestFTy = cast(NestFPTy->getElementType()); - if (const ParamAttrsList *NestAttrs = NestFTy->getParamAttrs()) { + if (const ParamAttrsList *NestAttrs = NestF->getParamAttrs()) { unsigned NestIdx = 1; const Type *NestTy = 0; uint16_t NestAttr = 0; @@ -8239,7 +8244,7 @@ Instruction *InstCombiner::transformCallThroughTrampoline(CallSite CS) { // Handle this by synthesizing a new function type, equal to FTy // with the chain parameter inserted. Likewise for attributes. - const ParamAttrsList *Attrs = FTy->getParamAttrs(); + const ParamAttrsList *Attrs = CS.getParamAttrs(); std::vector NewTypes; ParamAttrsVector NewAttrs; NewTypes.reserve(FTy->getNumParams()+1); @@ -8280,10 +8285,10 @@ Instruction *InstCombiner::transformCallThroughTrampoline(CallSite CS) { // Replace the trampoline call with a direct call. Let the generic // code sort out any function type mismatches. FunctionType *NewFTy = - FunctionType::get(FTy->getReturnType(), NewTypes, FTy->isVarArg(), - ParamAttrsList::get(NewAttrs)); + FunctionType::get(FTy->getReturnType(), NewTypes, FTy->isVarArg()); Constant *NewCallee = NestF->getType() == PointerType::get(NewFTy) ? NestF : ConstantExpr::getBitCast(NestF, PointerType::get(NewFTy)); + const ParamAttrsList *NewPAL = ParamAttrsList::get(NewAttrs); Instruction *NewCaller; if (InvokeInst *II = dyn_cast(Caller)) { @@ -8292,6 +8297,7 @@ Instruction *InstCombiner::transformCallThroughTrampoline(CallSite CS) { NewArgs.begin(), NewArgs.end(), Caller->getName(), Caller); cast(NewCaller)->setCallingConv(II->getCallingConv()); + cast(NewCaller)->setParamAttrs(NewPAL); } else { NewCaller = new CallInst(NewCallee, NewArgs.begin(), NewArgs.end(), Caller->getName(), Caller); @@ -8299,6 +8305,7 @@ Instruction *InstCombiner::transformCallThroughTrampoline(CallSite CS) { cast(NewCaller)->setTailCall(); cast(NewCaller)-> setCallingConv(cast(Caller)->getCallingConv()); + cast(NewCaller)->setParamAttrs(NewPAL); } if (Caller->getType() != Type::VoidTy && !Caller->use_empty()) Caller->replaceAllUsesWith(NewCaller); diff --git a/lib/Transforms/Scalar/LowerGC.cpp b/lib/Transforms/Scalar/LowerGC.cpp index bac7ac799bd..aff3f2cb301 100644 --- a/lib/Transforms/Scalar/LowerGC.cpp +++ b/lib/Transforms/Scalar/LowerGC.cpp @@ -339,6 +339,8 @@ bool LowerGC::runOnFunction(Function &F) { Value *II = new InvokeInst(CI->getCalledValue(), NewBB, Cleanup, Args.begin(), Args.end(), CI->getName(), CBB); + cast(II)->setCallingConv(CI->getCallingConv()); + cast(II)->setParamAttrs(CI->getParamAttrs()); CI->replaceAllUsesWith(II); delete CI; } diff --git a/lib/Transforms/Scalar/SimplifyCFG.cpp b/lib/Transforms/Scalar/SimplifyCFG.cpp index 3717a161aef..22d81c881ec 100644 --- a/lib/Transforms/Scalar/SimplifyCFG.cpp +++ b/lib/Transforms/Scalar/SimplifyCFG.cpp @@ -96,16 +96,11 @@ static bool IsNoReturn(const CallInst *CI) { if (Attrs->paramHasAttr(0, ParamAttr::NoReturn)) return true; - if (const Function *Callee = CI->getCalledFunction()) { + if (const Function *Callee = CI->getCalledFunction()) if (const ParamAttrsList *Attrs = Callee->getParamAttrs()) if (Attrs->paramHasAttr(0, ParamAttr::NoReturn)) return true; - - const FunctionType *FT = Callee->getFunctionType(); - if (const ParamAttrsList *Attrs = FT->getParamAttrs()) - if (Attrs->paramHasAttr(0, ParamAttr::NoReturn)) - return true; - } + return false; } @@ -115,16 +110,11 @@ static bool IsNoUnwind(const InvokeInst *II) { if (Attrs->paramHasAttr(0, ParamAttr::NoUnwind)) return true; - if (const Function *Callee = II->getCalledFunction()) { + if (const Function *Callee = II->getCalledFunction()) if (const ParamAttrsList *Attrs = Callee->getParamAttrs()) if (Attrs->paramHasAttr(0, ParamAttr::NoUnwind)) return true; - - const FunctionType *FT = Callee->getFunctionType(); - if (const ParamAttrsList *Attrs = FT->getParamAttrs()) - if (Attrs->paramHasAttr(0, ParamAttr::NoUnwind)) - return true; - } + return false; } diff --git a/lib/Transforms/Utils/CloneFunction.cpp b/lib/Transforms/Utils/CloneFunction.cpp index d1faf01a945..f05085fca16 100644 --- a/lib/Transforms/Utils/CloneFunction.cpp +++ b/lib/Transforms/Utils/CloneFunction.cpp @@ -79,6 +79,9 @@ void llvm::CloneFunctionInto(Function *NewFunc, const Function *OldFunc, assert(ValueMap.count(I) && "No mapping from source argument specified!"); #endif + // Clone the parameter attributes + NewFunc->setParamAttrs(OldFunc->getParamAttrs()); + // Loop over all of the basic blocks in the function, cloning them as // appropriate. Note that we save BE this way in order to handle cloning of // recursive functions into themselves. @@ -304,7 +307,7 @@ ConstantFoldMappedInstruction(const Instruction *I) { /// effect of this is to copy significantly less code in cases where (for /// example) a function call with constant arguments is inlined, and those /// constant arguments cause a significant amount of code in the callee to be -/// dead. Since this doesn't produce an exactly copy of the input, it can't be +/// dead. Since this doesn't produce an exact copy of the input, it can't be /// used for things like CloneFunction or CloneModule. void llvm::CloneAndPruneFunctionInto(Function *NewFunc, const Function *OldFunc, DenseMap &ValueMap, diff --git a/lib/Transforms/Utils/CloneModule.cpp b/lib/Transforms/Utils/CloneModule.cpp index cd9f4b6cac3..201da5be9af 100644 --- a/lib/Transforms/Utils/CloneModule.cpp +++ b/lib/Transforms/Utils/CloneModule.cpp @@ -66,6 +66,7 @@ Module *llvm::CloneModule(const Module *M, new Function(cast(I->getType()->getElementType()), GlobalValue::ExternalLinkage, I->getName(), New); NF->setCallingConv(I->getCallingConv()); + NF->setParamAttrs(I->getParamAttrs()); ValueMap[I]= NF; } @@ -120,5 +121,3 @@ Module *llvm::CloneModule(const Module *M, return New; } - -// vim: sw=2 diff --git a/lib/Transforms/Utils/InlineFunction.cpp b/lib/Transforms/Utils/InlineFunction.cpp index 96ad420d340..2a6d9ae9a2f 100644 --- a/lib/Transforms/Utils/InlineFunction.cpp +++ b/lib/Transforms/Utils/InlineFunction.cpp @@ -88,6 +88,7 @@ static void HandleInlinedInvoke(InvokeInst *II, BasicBlock *FirstNewBlock, InvokeArgs.begin(), InvokeArgs.end(), CI->getName(), BB->getTerminator()); II->setCallingConv(CI->getCallingConv()); + II->setParamAttrs(CI->getParamAttrs()); // Make sure that anything using the call now uses the invoke! CI->replaceAllUsesWith(II); diff --git a/lib/Transforms/Utils/LowerInvoke.cpp b/lib/Transforms/Utils/LowerInvoke.cpp index acb2b529c27..24b167ac877 100644 --- a/lib/Transforms/Utils/LowerInvoke.cpp +++ b/lib/Transforms/Utils/LowerInvoke.cpp @@ -212,9 +212,10 @@ bool LowerInvoke::insertCheapEHSupport(Function &F) { std::vector CallArgs(II->op_begin()+3, II->op_end()); // Insert a normal call instruction... CallInst *NewCall = new CallInst(II->getCalledValue(), - CallArgs.begin(), CallArgs.end(), "", II); + CallArgs.begin(), CallArgs.end(), "",II); NewCall->takeName(II); NewCall->setCallingConv(II->getCallingConv()); + NewCall->setParamAttrs(II->getParamAttrs()); II->replaceAllUsesWith(NewCall); // Insert an unconditional branch to the normal destination. @@ -273,6 +274,7 @@ void LowerInvoke::rewriteExpensiveInvoke(InvokeInst *II, unsigned InvokeNo, II); NewCall->takeName(II); NewCall->setCallingConv(II->getCallingConv()); + NewCall->setParamAttrs(II->getParamAttrs()); II->replaceAllUsesWith(NewCall); // Replace the invoke with an uncond branch. diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp index 470daf36fe2..1305fd92c76 100644 --- a/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/lib/Transforms/Utils/SimplifyCFG.cpp @@ -1376,6 +1376,7 @@ bool llvm::SimplifyCFG(BasicBlock *BB) { CallInst *CI = new CallInst(II->getCalledValue(), Args.begin(), Args.end(), II->getName(), BI); CI->setCallingConv(II->getCallingConv()); + CI->setParamAttrs(II->getParamAttrs()); // If the invoke produced a value, the Call now does instead II->replaceAllUsesWith(CI); delete II; @@ -1751,6 +1752,7 @@ bool llvm::SimplifyCFG(BasicBlock *BB) { Args.begin(), Args.end(), II->getName(), BI); CI->setCallingConv(II->getCallingConv()); + CI->setParamAttrs(II->getParamAttrs()); // If the invoke produced a value, the Call does now instead. II->replaceAllUsesWith(CI); delete II; diff --git a/lib/VMCore/AsmWriter.cpp b/lib/VMCore/AsmWriter.cpp index 859807ba341..ef8161b0334 100644 --- a/lib/VMCore/AsmWriter.cpp +++ b/lib/VMCore/AsmWriter.cpp @@ -305,28 +305,17 @@ static void calcTypeName(const Type *Ty, const FunctionType *FTy = cast(Ty); calcTypeName(FTy->getReturnType(), TypeStack, TypeNames, Result); Result += " ("; - unsigned Idx = 1; - const ParamAttrsList *Attrs = FTy->getParamAttrs(); for (FunctionType::param_iterator I = FTy->param_begin(), - E = FTy->param_end(); I != E; ++I) { + E = FTy->param_end(); I != E; ++I) { if (I != FTy->param_begin()) Result += ", "; calcTypeName(*I, TypeStack, TypeNames, Result); - if (Attrs && Attrs->getParamAttrs(Idx) != ParamAttr::None) { - Result += + " "; - Result += Attrs->getParamAttrsTextByIndex(Idx); - } - Idx++; } if (FTy->isVarArg()) { if (FTy->getNumParams()) Result += ", "; Result += "..."; } Result += ")"; - if (Attrs && Attrs->getParamAttrs(0) != ParamAttr::None) { - Result += " "; - Result += Attrs->getParamAttrsTextByIndex(0); - } break; } case Type::StructTyID: { @@ -749,6 +738,7 @@ public: inline void write(const Type *Ty) { printType(Ty); } void writeOperand(const Value *Op, bool PrintType); + void writeParamOperand(const Value *Operand, uint16_t Attrs); const Module* getModule() { return TheModule; } @@ -789,25 +779,17 @@ std::ostream &AssemblyWriter::printTypeAtLeastOneLevel(const Type *Ty) { else if (const FunctionType *FTy = dyn_cast(Ty)) { printType(FTy->getReturnType()); Out << " ("; - unsigned Idx = 1; - const ParamAttrsList *Attrs = FTy->getParamAttrs(); for (FunctionType::param_iterator I = FTy->param_begin(), E = FTy->param_end(); I != E; ++I) { if (I != FTy->param_begin()) Out << ", "; printType(*I); - if (Attrs && Attrs->getParamAttrs(Idx) != ParamAttr::None) { - Out << " " << Attrs->getParamAttrsTextByIndex(Idx); - } - Idx++; } if (FTy->isVarArg()) { if (FTy->getNumParams()) Out << ", "; Out << "..."; } Out << ')'; - if (Attrs && Attrs->getParamAttrs(0) != ParamAttr::None) - Out << ' ' << Attrs->getParamAttrsTextByIndex(0); } else if (const StructType *STy = dyn_cast(Ty)) { if (STy->isPacked()) Out << '<'; @@ -850,6 +832,20 @@ void AssemblyWriter::writeOperand(const Value *Operand, bool PrintType) { } } +void AssemblyWriter::writeParamOperand(const Value *Operand, uint16_t Attrs) { + if (Operand == 0) { + Out << ""; + } else { + Out << ' '; + // Print the type + printType(Operand->getType()); + // Print parameter attributes list + if (Attrs != ParamAttr::None) + Out << ' ' << ParamAttrsList::getParamAttrsText(Attrs); + // Print the operand + WriteAsOperandInternal(Out, Operand, TypeNames, &Machine); + } +} void AssemblyWriter::printModule(const Module *M) { if (!M->getModuleIdentifier().empty() && @@ -1066,7 +1062,7 @@ void AssemblyWriter::printFunction(const Function *F) { } const FunctionType *FT = F->getFunctionType(); - const ParamAttrsList *Attrs = FT->getParamAttrs(); + const ParamAttrsList *Attrs = F->getParamAttrs(); printType(F->getReturnType()) << ' '; if (!F->getName().empty()) Out << getLLVMName(F->getName(), GlobalPrefix); @@ -1139,6 +1135,7 @@ void AssemblyWriter::printArgument(const Argument *Arg, uint16_t Attrs) { // Output type... printType(Arg->getType()); + // Output parameter attributes list if (Attrs != ParamAttr::None) Out << ' ' << ParamAttrsList::getParamAttrsText(Attrs); @@ -1295,7 +1292,7 @@ void AssemblyWriter::printInstruction(const Instruction &I) { const PointerType *PTy = cast(Operand->getType()); const FunctionType *FTy = cast(PTy->getElementType()); const Type *RetTy = FTy->getReturnType(); - const ParamAttrsList *PAL = FTy->getParamAttrs(); + const ParamAttrsList *PAL = CI->getParamAttrs(); // If possible, print out the short form of the call instruction. We can // only do this if the first argument is a pointer to a nonvararg function, @@ -1313,9 +1310,7 @@ void AssemblyWriter::printInstruction(const Instruction &I) { for (unsigned op = 1, Eop = I.getNumOperands(); op < Eop; ++op) { if (op > 1) Out << ','; - writeOperand(I.getOperand(op), true); - if (PAL && PAL->getParamAttrs(op) != ParamAttr::None) - Out << " " << PAL->getParamAttrsTextByIndex(op); + writeParamOperand(I.getOperand(op), PAL ? PAL->getParamAttrs(op) : 0); } Out << " )"; if (PAL && PAL->getParamAttrs(0) != ParamAttr::None) @@ -1324,7 +1319,7 @@ void AssemblyWriter::printInstruction(const Instruction &I) { const PointerType *PTy = cast(Operand->getType()); const FunctionType *FTy = cast(PTy->getElementType()); const Type *RetTy = FTy->getReturnType(); - const ParamAttrsList *PAL = FTy->getParamAttrs(); + const ParamAttrsList *PAL = II->getParamAttrs(); // Print the calling convention being used. switch (II->getCallingConv()) { @@ -1353,9 +1348,7 @@ void AssemblyWriter::printInstruction(const Instruction &I) { for (unsigned op = 3, Eop = I.getNumOperands(); op < Eop; ++op) { if (op > 3) Out << ','; - writeOperand(I.getOperand(op), true); - if (PAL && PAL->getParamAttrs(op-2) != ParamAttr::None) - Out << " " << PAL->getParamAttrsTextByIndex(op-2); + writeParamOperand(I.getOperand(op), PAL ? PAL->getParamAttrs(op-2) : 0); } Out << " )"; diff --git a/lib/VMCore/AutoUpgrade.cpp b/lib/VMCore/AutoUpgrade.cpp index b56fe70235e..40c431c2794 100644 --- a/lib/VMCore/AutoUpgrade.cpp +++ b/lib/VMCore/AutoUpgrade.cpp @@ -127,9 +127,6 @@ void llvm::UpgradeIntrinsicCall(CallInst *CI, Function *NewFn) { Function *F = CI->getCalledFunction(); assert(F && "CallInst has no function associated with it."); - - const FunctionType *FTy = F->getFunctionType(); - const FunctionType *NewFnTy = NewFn->getFunctionType(); switch(NewFn->getIntrinsicID()) { default: assert(0 && "Unknown function for CallInst upgrade."); @@ -149,10 +146,10 @@ void llvm::UpgradeIntrinsicCall(CallInst *CI, Function *NewFn) { // Handle any uses of the old CallInst. if (!CI->use_empty()) { // Check for sign extend parameter attributes on the return values. - bool SrcSExt = NewFnTy->getParamAttrs() && - NewFnTy->getParamAttrs()->paramHasAttr(0,ParamAttr::SExt); - bool DestSExt = FTy->getParamAttrs() && - FTy->getParamAttrs()->paramHasAttr(0,ParamAttr::SExt); + bool SrcSExt = NewFn->getParamAttrs() && + NewFn->getParamAttrs()->paramHasAttr(0,ParamAttr::SExt); + bool DestSExt = F->getParamAttrs() && + F->getParamAttrs()->paramHasAttr(0,ParamAttr::SExt); // Construct an appropriate cast from the new return type to the old. CastInst *RetCast = CastInst::create( diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp index 2b83e6b9172..023cb556f44 100644 --- a/lib/VMCore/Function.cpp +++ b/lib/VMCore/Function.cpp @@ -161,7 +161,7 @@ ParamAttrsList::areCompatible(const ParamAttrsList *A, const ParamAttrsList *B){ void ParamAttrsList::Profile(FoldingSetNodeID &ID) const { for (unsigned i = 0; i < attrs.size(); ++i) { - unsigned val = attrs[i].attrs << 16 | attrs[i].index; + uint32_t val = uint32_t(attrs[i].attrs) << 16 | attrs[i].index; ID.AddInteger(val); } } @@ -170,7 +170,10 @@ static ManagedStatic > ParamAttrsLists; ParamAttrsList * ParamAttrsList::get(const ParamAttrsVector &attrVec) { - assert(!attrVec.empty() && "Illegal to create empty ParamAttrsList"); + // If there are no attributes then return a null ParamAttrsList pointer. + if (attrVec.empty()) + return 0; + #ifndef NDEBUG for (unsigned i = 0, e = attrVec.size(); i < e; ++i) { assert(attrVec[i].attrs != ParamAttr::None @@ -179,15 +182,22 @@ ParamAttrsList::get(const ParamAttrsVector &attrVec) { && "Misordered ParamAttrsList!"); } #endif + + // Otherwise, build a key to look up the existing attributes. ParamAttrsList key(attrVec); FoldingSetNodeID ID; key.Profile(ID); void *InsertPos; ParamAttrsList* PAL = ParamAttrsLists->FindNodeOrInsertPos(ID, InsertPos); + + // If we didn't find any existing attributes of the same shape then + // create a new one and insert it. if (!PAL) { PAL = new ParamAttrsList(attrVec); ParamAttrsLists->InsertNode(PAL, InsertPos); } + + // Return the ParamAttrsList that we found or created. return PAL; } @@ -201,8 +211,8 @@ ParamAttrsList::~ParamAttrsList() { Function::Function(const FunctionType *Ty, LinkageTypes Linkage, const std::string &name, Module *ParentModule) - : GlobalValue(PointerType::get(Ty), Value::FunctionVal, 0, 0, Linkage, name) { - ParamAttrs = 0; + : GlobalValue(PointerType::get(Ty), Value::FunctionVal, 0, 0, Linkage, name), + ParamAttrs(0) { SymTab = new ValueSymbolTable(); assert((getReturnType()->isFirstClassType() ||getReturnType() == Type::VoidTy) @@ -259,16 +269,30 @@ void Function::setParent(Module *parent) { LeakDetector::removeGarbageObject(this); } -void Function::setParamAttrs(ParamAttrsList *attrs) { +void Function::setParamAttrs(const ParamAttrsList *attrs) { + // Avoid deleting the ParamAttrsList if they are setting the + // attributes to the same list. + if (ParamAttrs == attrs) + return; + + // Drop reference on the old ParamAttrsList if (ParamAttrs) ParamAttrs->dropRef(); + // Add reference to the new ParamAttrsList if (attrs) attrs->addRef(); + // Set the new ParamAttrsList. ParamAttrs = attrs; } +bool Function::isStructReturn() const { + if (ParamAttrs) + return ParamAttrs->paramHasAttr(1, ParamAttr::StructRet); + return false; +} + const FunctionType *Function::getFunctionType() const { return cast(getType()->getElementType()); } diff --git a/lib/VMCore/Instructions.cpp b/lib/VMCore/Instructions.cpp index 6bee186e570..7226f66e209 100644 --- a/lib/VMCore/Instructions.cpp +++ b/lib/VMCore/Instructions.cpp @@ -35,6 +35,18 @@ void CallSite::setCallingConv(unsigned CC) { else cast(I)->setCallingConv(CC); } +const ParamAttrsList* CallSite::getParamAttrs() const { + if (CallInst *CI = dyn_cast(I)) + return CI->getParamAttrs(); + else + return cast(I)->getParamAttrs(); +} +void CallSite::setParamAttrs(const ParamAttrsList *PAL) { + if (CallInst *CI = dyn_cast(I)) + CI->setParamAttrs(PAL); + else + cast(I)->setParamAttrs(PAL); +} @@ -341,8 +353,9 @@ CallInst::CallInst(Value *Func, const std::string &Name, CallInst::CallInst(const CallInst &CI) : Instruction(CI.getType(), Instruction::Call, new Use[CI.getNumOperands()], - CI.getNumOperands()) { - ParamAttrs = 0; + CI.getNumOperands()), + ParamAttrs(0) { + setParamAttrs(CI.getParamAttrs()); SubclassData = CI.SubclassData; Use *OL = OperandList; Use *InOL = CI.OperandList; @@ -350,7 +363,10 @@ CallInst::CallInst(const CallInst &CI) OL[i].init(InOL[i], this); } -void CallInst::setParamAttrs(ParamAttrsList *newAttrs) { +void CallInst::setParamAttrs(const ParamAttrsList *newAttrs) { + if (ParamAttrs == newAttrs) + return; + if (ParamAttrs) ParamAttrs->dropRef(); @@ -360,6 +376,12 @@ void CallInst::setParamAttrs(ParamAttrsList *newAttrs) { ParamAttrs = newAttrs; } +bool CallInst::isStructReturn() const { + if (ParamAttrs) + return ParamAttrs->paramHasAttr(1, ParamAttr::StructRet); + return false; +} + //===----------------------------------------------------------------------===// // InvokeInst Implementation //===----------------------------------------------------------------------===// @@ -397,8 +419,9 @@ void InvokeInst::init(Value *Fn, BasicBlock *IfNormal, BasicBlock *IfException, InvokeInst::InvokeInst(const InvokeInst &II) : TerminatorInst(II.getType(), Instruction::Invoke, - new Use[II.getNumOperands()], II.getNumOperands()) { - ParamAttrs = 0; + new Use[II.getNumOperands()], II.getNumOperands()), + ParamAttrs(0) { + setParamAttrs(II.getParamAttrs()); SubclassData = II.SubclassData; Use *OL = OperandList, *InOL = II.OperandList; for (unsigned i = 0, e = II.getNumOperands(); i != e; ++i) @@ -415,7 +438,10 @@ void InvokeInst::setSuccessorV(unsigned idx, BasicBlock *B) { return setSuccessor(idx, B); } -void InvokeInst::setParamAttrs(ParamAttrsList *newAttrs) { +void InvokeInst::setParamAttrs(const ParamAttrsList *newAttrs) { + if (ParamAttrs == newAttrs) + return; + if (ParamAttrs) ParamAttrs->dropRef(); @@ -425,6 +451,12 @@ void InvokeInst::setParamAttrs(ParamAttrsList *newAttrs) { ParamAttrs = newAttrs; } +bool InvokeInst::isStructReturn() const { + if (ParamAttrs) + return ParamAttrs->paramHasAttr(1, ParamAttr::StructRet); + return false; +} + //===----------------------------------------------------------------------===// // ReturnInst Implementation //===----------------------------------------------------------------------===// diff --git a/lib/VMCore/Type.cpp b/lib/VMCore/Type.cpp index b8ce47bad86..1e584770420 100644 --- a/lib/VMCore/Type.cpp +++ b/lib/VMCore/Type.cpp @@ -12,7 +12,6 @@ //===----------------------------------------------------------------------===// #include "llvm/DerivedTypes.h" -#include "llvm/ParameterAttributes.h" #include "llvm/Constants.h" #include "llvm/ADT/DepthFirstIterator.h" #include "llvm/ADT/StringExtras.h" @@ -307,15 +306,10 @@ static std::string getTypeDescription(const Type *Ty, if (!Result.empty()) Result += " "; Result += getTypeDescription(FTy->getReturnType(), TypeStack) + " ("; - unsigned Idx = 1; - const ParamAttrsList *Attrs = FTy->getParamAttrs(); for (FunctionType::param_iterator I = FTy->param_begin(), - E = FTy->param_end(); I != E; ++I) { + E = FTy->param_end(); I != E; ++I) { if (I != FTy->param_begin()) Result += ", "; - if (Attrs && Attrs->getParamAttrs(Idx) != ParamAttr::None) - Result += Attrs->getParamAttrsTextByIndex(Idx); - Idx++; Result += getTypeDescription(*I, TypeStack); } if (FTy->isVarArg()) { @@ -323,9 +317,6 @@ static std::string getTypeDescription(const Type *Ty, Result += "..."; } Result += ")"; - if (Attrs && Attrs->getParamAttrs(0) != ParamAttr::None) { - Result += " " + Attrs->getParamAttrsTextByIndex(0); - } break; } case Type::StructTyID: { @@ -444,8 +435,8 @@ const IntegerType *Type::Int64Ty = new BuiltinIntegerType(64); FunctionType::FunctionType(const Type *Result, const std::vector &Params, - bool IsVarArgs, const ParamAttrsList *Attrs) - : DerivedType(FunctionTyID), isVarArgs(IsVarArgs), ParamAttrs(Attrs) { + bool IsVarArgs) + : DerivedType(FunctionTyID), isVarArgs(IsVarArgs) { ContainedTys = reinterpret_cast(this+1); NumContainedTys = Params.size() + 1; // + 1 for result type assert((Result->isFirstClassType() || Result == Type::VoidTy || @@ -667,16 +658,7 @@ static bool TypesEqual(const Type *Ty, const Type *Ty2, FTy->getNumParams() != FTy2->getNumParams() || !TypesEqual(FTy->getReturnType(), FTy2->getReturnType(), EqTypes)) return false; - const ParamAttrsList *Attrs1 = FTy->getParamAttrs(); - const ParamAttrsList *Attrs2 = FTy2->getParamAttrs(); - if ((!Attrs1 && Attrs2) || (!Attrs2 && Attrs1) || - (Attrs1 && Attrs2 && (Attrs1->size() != Attrs2->size() || - (Attrs1->getParamAttrs(0) != Attrs2->getParamAttrs(0))))) - return false; - for (unsigned i = 0, e = FTy2->getNumParams(); i != e; ++i) { - if (Attrs1 && Attrs1->getParamAttrs(i+1) != Attrs2->getParamAttrs(i+1)) - return false; if (!TypesEqual(FTy->getParamType(i), FTy2->getParamType(i), EqTypes)) return false; } @@ -1055,12 +1037,10 @@ namespace llvm { class FunctionValType { const Type *RetTy; std::vector ArgTypes; - const ParamAttrsList *ParamAttrs; bool isVarArg; public: FunctionValType(const Type *ret, const std::vector &args, - bool IVA, const ParamAttrsList *attrs) - : RetTy(ret), ParamAttrs(attrs), isVarArg(IVA) { + bool isVA) : RetTy(ret), isVarArg(isVA) { for (unsigned i = 0; i < args.size(); ++i) ArgTypes.push_back(args[i]); } @@ -1068,9 +1048,7 @@ public: static FunctionValType get(const FunctionType *FT); static unsigned hashTypeStructure(const FunctionType *FT) { - unsigned Result = FT->getNumParams()*64 + FT->isVarArg(); - if (FT->getParamAttrs()) - Result += FT->getParamAttrs()->size()*2; + unsigned Result = FT->getNumParams()*2 + FT->isVarArg(); return Result; } @@ -1081,13 +1059,6 @@ public: if (isVarArg > MTV.isVarArg) return false; if (ArgTypes < MTV.ArgTypes) return true; if (ArgTypes > MTV.ArgTypes) return false; - if (ParamAttrs) - if (MTV.ParamAttrs) - return *ParamAttrs < *MTV.ParamAttrs; - else - return false; - else if (MTV.ParamAttrs) - return true; return false; } }; @@ -1102,18 +1073,15 @@ FunctionValType FunctionValType::get(const FunctionType *FT) { ParamTypes.reserve(FT->getNumParams()); for (unsigned i = 0, e = FT->getNumParams(); i != e; ++i) ParamTypes.push_back(FT->getParamType(i)); - return FunctionValType(FT->getReturnType(), ParamTypes, FT->isVarArg(), - FT->getParamAttrs()); + return FunctionValType(FT->getReturnType(), ParamTypes, FT->isVarArg()); } // FunctionType::get - The factory function for the FunctionType class... FunctionType *FunctionType::get(const Type *ReturnType, const std::vector &Params, - bool isVarArg, - const ParamAttrsList *Attrs) { - - FunctionValType VT(ReturnType, Params, isVarArg, Attrs); + bool isVarArg) { + FunctionValType VT(ReturnType, Params, isVarArg); FunctionType *FT = FunctionTypes->get(VT); if (FT) { return FT; @@ -1121,7 +1089,7 @@ FunctionType *FunctionType::get(const Type *ReturnType, FT = (FunctionType*) new char[sizeof(FunctionType) + sizeof(PATypeHandle)*(Params.size()+1)]; - new (FT) FunctionType(ReturnType, Params, isVarArg, Attrs); + new (FT) FunctionType(ReturnType, Params, isVarArg); FunctionTypes->add(VT, FT); #ifdef DEBUG_MERGE_TYPES @@ -1130,12 +1098,6 @@ FunctionType *FunctionType::get(const Type *ReturnType, return FT; } -bool FunctionType::isStructReturn() const { - if (ParamAttrs) - return ParamAttrs->paramHasAttr(1, ParamAttr::StructRet); - return false; -} - //===----------------------------------------------------------------------===// // Array Type Factory... // diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp index a547721d68d..eb7c90f01cc 100644 --- a/lib/VMCore/Verifier.cpp +++ b/lib/VMCore/Verifier.cpp @@ -390,12 +390,12 @@ void Verifier::visitFunction(Function &F) { F.getReturnType() == Type::VoidTy, "Functions cannot return aggregate values!", &F); - Assert1(!FT->isStructReturn() || FT->getReturnType() == Type::VoidTy, + Assert1(!F.isStructReturn() || FT->getReturnType() == Type::VoidTy, "Invalid struct-return function!", &F); bool SawSRet = false; - if (const ParamAttrsList *Attrs = FT->getParamAttrs()) { + if (const ParamAttrsList *Attrs = F.getParamAttrs()) { bool SawNest = false; for (unsigned Idx = 0; Idx <= FT->getNumParams(); ++Idx) { @@ -448,7 +448,7 @@ void Verifier::visitFunction(Function &F) { } } - Assert1(SawSRet == FT->isStructReturn(), + Assert1(SawSRet == F.isStructReturn(), "StructReturn function with no sret attribute!", &F); // Check that this function meets the restrictions on this calling convention. diff --git a/test/Assembler/2006-05-26-VarargsCallEncode.ll b/test/Assembler/2006-05-26-VarargsCallEncode.ll index c87b19d3d30..c36bcfa220e 100644 --- a/test/Assembler/2006-05-26-VarargsCallEncode.ll +++ b/test/Assembler/2006-05-26-VarargsCallEncode.ll @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | \ -; RUN: grep {tail call void (\{ \}\\* sret} +; RUN: grep {tail call void.*sret null} declare csretcc void %foo({}*, ...) diff --git a/test/Assembler/2007-02-07-UpgradeCSRETCC.ll b/test/Assembler/2007-02-07-UpgradeCSRETCC.ll index 745c499d3f8..da6faa69700 100644 --- a/test/Assembler/2007-02-07-UpgradeCSRETCC.ll +++ b/test/Assembler/2007-02-07-UpgradeCSRETCC.ll @@ -1,7 +1,5 @@ -; For PR1187 ; RUN: llvm-upgrade < %s > /dev/null -; XFAIL: * -; Un-XFAIL this when PR1146 is fixed. +; PR1187 %mystruct = type { int, double } %glob = global %mystruct { int 3, double 42.0 } diff --git a/test/Assembler/2007-11-26-AttributeOverload.ll b/test/Assembler/2007-11-26-AttributeOverload.ll new file mode 100644 index 00000000000..9aec8d95109 --- /dev/null +++ b/test/Assembler/2007-11-26-AttributeOverload.ll @@ -0,0 +1,4 @@ +; RUN: not llvm-as < %s + +declare i32 @atoi(i8*) nounwind readonly +declare i32 @atoi(i8*) diff --git a/test/Assembler/2007-11-27-AutoUpgradeAttributes.ll b/test/Assembler/2007-11-27-AutoUpgradeAttributes.ll new file mode 100644 index 00000000000..ee260eadb7a --- /dev/null +++ b/test/Assembler/2007-11-27-AutoUpgradeAttributes.ll @@ -0,0 +1,3 @@ +; RUN: llvm-as < %s + +@FP = weak global i8 (...) signext * null diff --git a/test/Feature/paramattrs.ll b/test/Feature/paramattrs.ll index 24c46dc22c1..3bee6177e0b 100644 --- a/test/Feature/paramattrs.ll +++ b/test/Feature/paramattrs.ll @@ -14,7 +14,7 @@ declare void @exit(i32) noreturn nounwind define i32 @main(i32 inreg %argc, i8 ** inreg %argv) nounwind { %val = trunc i32 %argc to i16 - %res1 = call i16 (i16 signext) signext *@test(i16 %val) + %res1 = call i16 (i16 signext) signext *@test(i16 signext %val) signext %two = add i16 %res1, %res1 %res2 = call i8 @test2(i16 %two zeroext) zeroext %retVal = sext i16 %two to i32 diff --git a/test/Integer/paramattrs_bt.ll b/test/Integer/paramattrs_bt.ll index e5b6a3e65b5..47ef7539b3e 100644 --- a/test/Integer/paramattrs_bt.ll +++ b/test/Integer/paramattrs_bt.ll @@ -11,7 +11,7 @@ declare i8 @"test2" (i16 zeroext %a2) zeroext define i33 @main(i33 %argc, i8 **%argv) { %val = trunc i33 %argc to i16 - %res = call i16 (i16 signext) signext *@test(i16 %val) + %res = call i16 (i16 signext) signext *@test(i16 signext %val) signext %two = add i16 %res, %res %res2 = call i8 @test2(i16 %two zeroext) zeroext %retVal = sext i16 %two to i33 diff --git a/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll b/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll index 48a1458508a..d067ac09944 100644 --- a/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll +++ b/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll @@ -1,6 +1,4 @@ ; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output -; XFAIL: * -; Un-XFAIL this when PR1146 is finished. %struct..4._102 = type { %struct.QVectorData* } %struct..5._125 = type { %struct.QMapData* } diff --git a/tools/llvm-upgrade/UpgradeParser.cpp.cvs b/tools/llvm-upgrade/UpgradeParser.cpp.cvs index 2f6c02a216f..8f8327ec40b 100644 --- a/tools/llvm-upgrade/UpgradeParser.cpp.cvs +++ b/tools/llvm-upgrade/UpgradeParser.cpp.cvs @@ -1,167 +1,386 @@ +/* A Bison parser, made by GNU Bison 2.3. */ -/* A Bison parser, made from /Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y - by GNU Bison version 1.28 */ +/* Skeleton implementation for Bison's Yacc-like parsers in C -#define YYBISON 1 /* Identify Bison output. */ + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ + +/* As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ + +/* C LALR(1) parser skeleton written by Richard Stallman, by + simplifying the original so-called "semantic" parser. */ + +/* All symbols defined below should begin with yy or YY, to avoid + infringing on user name space. This should be done even for local + variables, as they might otherwise be expanded by user macros. + There are some unavoidable exceptions within include files to + define necessary library symbols; they are noted "INFRINGES ON + USER NAME SPACE" below. */ + +/* Identify Bison output. */ +#define YYBISON 1 + +/* Bison version. */ +#define YYBISON_VERSION "2.3" + +/* Skeleton name. */ +#define YYSKELETON_NAME "yacc.c" + +/* Pure parsers. */ +#define YYPURE 0 + +/* Using locations. */ +#define YYLSP_NEEDED 0 + +/* Substitute the variable and function names. */ #define yyparse Upgradeparse -#define yylex Upgradelex +#define yylex Upgradelex #define yyerror Upgradeerror -#define yylval Upgradelval -#define yychar Upgradechar +#define yylval Upgradelval +#define yychar Upgradechar #define yydebug Upgradedebug #define yynerrs Upgradenerrs -#define ESINT64VAL 257 -#define EUINT64VAL 258 -#define SINTVAL 259 -#define UINTVAL 260 -#define FPVAL 261 -#define VOID 262 -#define BOOL 263 -#define SBYTE 264 -#define UBYTE 265 -#define SHORT 266 -#define USHORT 267 -#define INT 268 -#define UINT 269 -#define LONG 270 -#define ULONG 271 -#define FLOAT 272 -#define DOUBLE 273 -#define TYPE 274 -#define LABEL 275 -#define VAR_ID 276 -#define LABELSTR 277 -#define STRINGCONSTANT 278 -#define IMPLEMENTATION 279 -#define ZEROINITIALIZER 280 -#define TRUETOK 281 -#define FALSETOK 282 -#define BEGINTOK 283 -#define ENDTOK 284 -#define DECLARE 285 -#define GLOBAL 286 -#define CONSTANT 287 -#define SECTION 288 -#define VOLATILE 289 -#define TO 290 -#define DOTDOTDOT 291 -#define NULL_TOK 292 -#define UNDEF 293 -#define CONST 294 -#define INTERNAL 295 -#define LINKONCE 296 -#define WEAK 297 -#define APPENDING 298 -#define DLLIMPORT 299 -#define DLLEXPORT 300 -#define EXTERN_WEAK 301 -#define OPAQUE 302 -#define NOT 303 -#define EXTERNAL 304 -#define TARGET 305 -#define TRIPLE 306 -#define ENDIAN 307 -#define POINTERSIZE 308 -#define LITTLE 309 -#define BIG 310 -#define ALIGN 311 -#define DEPLIBS 312 -#define CALL 313 -#define TAIL 314 -#define ASM_TOK 315 -#define MODULE 316 -#define SIDEEFFECT 317 -#define CC_TOK 318 -#define CCC_TOK 319 -#define CSRETCC_TOK 320 -#define FASTCC_TOK 321 -#define COLDCC_TOK 322 -#define X86_STDCALLCC_TOK 323 -#define X86_FASTCALLCC_TOK 324 -#define DATALAYOUT 325 -#define RET 326 -#define BR 327 -#define SWITCH 328 -#define INVOKE 329 -#define UNREACHABLE 330 -#define UNWIND 331 -#define EXCEPT 332 -#define ADD 333 -#define SUB 334 -#define MUL 335 -#define DIV 336 -#define UDIV 337 -#define SDIV 338 -#define FDIV 339 -#define REM 340 -#define UREM 341 -#define SREM 342 -#define FREM 343 -#define AND 344 -#define OR 345 -#define XOR 346 -#define SHL 347 -#define SHR 348 -#define ASHR 349 -#define LSHR 350 -#define SETLE 351 -#define SETGE 352 -#define SETLT 353 -#define SETGT 354 -#define SETEQ 355 -#define SETNE 356 -#define ICMP 357 -#define FCMP 358 -#define MALLOC 359 -#define ALLOCA 360 -#define FREE 361 -#define LOAD 362 -#define STORE 363 -#define GETELEMENTPTR 364 -#define PHI_TOK 365 -#define SELECT 366 -#define VAARG 367 -#define EXTRACTELEMENT 368 -#define INSERTELEMENT 369 -#define SHUFFLEVECTOR 370 -#define VAARG_old 371 -#define VANEXT_old 372 -#define EQ 373 -#define NE 374 -#define SLT 375 -#define SGT 376 -#define SLE 377 -#define SGE 378 -#define ULT 379 -#define UGT 380 -#define ULE 381 -#define UGE 382 -#define OEQ 383 -#define ONE 384 -#define OLT 385 -#define OGT 386 -#define OLE 387 -#define OGE 388 -#define ORD 389 -#define UNO 390 -#define UEQ 391 -#define UNE 392 -#define CAST 393 -#define TRUNC 394 -#define ZEXT 395 -#define SEXT 396 -#define FPTRUNC 397 -#define FPEXT 398 -#define FPTOUI 399 -#define FPTOSI 400 -#define UITOFP 401 -#define SITOFP 402 -#define PTRTOINT 403 -#define INTTOPTR 404 -#define BITCAST 405 - -#line 14 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" + + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + ESINT64VAL = 258, + EUINT64VAL = 259, + SINTVAL = 260, + UINTVAL = 261, + FPVAL = 262, + VOID = 263, + BOOL = 264, + SBYTE = 265, + UBYTE = 266, + SHORT = 267, + USHORT = 268, + INT = 269, + UINT = 270, + LONG = 271, + ULONG = 272, + FLOAT = 273, + DOUBLE = 274, + TYPE = 275, + LABEL = 276, + VAR_ID = 277, + LABELSTR = 278, + STRINGCONSTANT = 279, + IMPLEMENTATION = 280, + ZEROINITIALIZER = 281, + TRUETOK = 282, + FALSETOK = 283, + BEGINTOK = 284, + ENDTOK = 285, + DECLARE = 286, + GLOBAL = 287, + CONSTANT = 288, + SECTION = 289, + VOLATILE = 290, + TO = 291, + DOTDOTDOT = 292, + NULL_TOK = 293, + UNDEF = 294, + CONST = 295, + INTERNAL = 296, + LINKONCE = 297, + WEAK = 298, + APPENDING = 299, + DLLIMPORT = 300, + DLLEXPORT = 301, + EXTERN_WEAK = 302, + OPAQUE = 303, + NOT = 304, + EXTERNAL = 305, + TARGET = 306, + TRIPLE = 307, + ENDIAN = 308, + POINTERSIZE = 309, + LITTLE = 310, + BIG = 311, + ALIGN = 312, + DEPLIBS = 313, + CALL = 314, + TAIL = 315, + ASM_TOK = 316, + MODULE = 317, + SIDEEFFECT = 318, + CC_TOK = 319, + CCC_TOK = 320, + CSRETCC_TOK = 321, + FASTCC_TOK = 322, + COLDCC_TOK = 323, + X86_STDCALLCC_TOK = 324, + X86_FASTCALLCC_TOK = 325, + DATALAYOUT = 326, + RET = 327, + BR = 328, + SWITCH = 329, + INVOKE = 330, + UNREACHABLE = 331, + UNWIND = 332, + EXCEPT = 333, + ADD = 334, + SUB = 335, + MUL = 336, + DIV = 337, + UDIV = 338, + SDIV = 339, + FDIV = 340, + REM = 341, + UREM = 342, + SREM = 343, + FREM = 344, + AND = 345, + OR = 346, + XOR = 347, + SHL = 348, + SHR = 349, + ASHR = 350, + LSHR = 351, + SETLE = 352, + SETGE = 353, + SETLT = 354, + SETGT = 355, + SETEQ = 356, + SETNE = 357, + ICMP = 358, + FCMP = 359, + MALLOC = 360, + ALLOCA = 361, + FREE = 362, + LOAD = 363, + STORE = 364, + GETELEMENTPTR = 365, + PHI_TOK = 366, + SELECT = 367, + VAARG = 368, + EXTRACTELEMENT = 369, + INSERTELEMENT = 370, + SHUFFLEVECTOR = 371, + VAARG_old = 372, + VANEXT_old = 373, + EQ = 374, + NE = 375, + SLT = 376, + SGT = 377, + SLE = 378, + SGE = 379, + ULT = 380, + UGT = 381, + ULE = 382, + UGE = 383, + OEQ = 384, + ONE = 385, + OLT = 386, + OGT = 387, + OLE = 388, + OGE = 389, + ORD = 390, + UNO = 391, + UEQ = 392, + UNE = 393, + CAST = 394, + TRUNC = 395, + ZEXT = 396, + SEXT = 397, + FPTRUNC = 398, + FPEXT = 399, + FPTOUI = 400, + FPTOSI = 401, + UITOFP = 402, + SITOFP = 403, + PTRTOINT = 404, + INTTOPTR = 405, + BITCAST = 406 + }; +#endif +/* Tokens. */ +#define ESINT64VAL 258 +#define EUINT64VAL 259 +#define SINTVAL 260 +#define UINTVAL 261 +#define FPVAL 262 +#define VOID 263 +#define BOOL 264 +#define SBYTE 265 +#define UBYTE 266 +#define SHORT 267 +#define USHORT 268 +#define INT 269 +#define UINT 270 +#define LONG 271 +#define ULONG 272 +#define FLOAT 273 +#define DOUBLE 274 +#define TYPE 275 +#define LABEL 276 +#define VAR_ID 277 +#define LABELSTR 278 +#define STRINGCONSTANT 279 +#define IMPLEMENTATION 280 +#define ZEROINITIALIZER 281 +#define TRUETOK 282 +#define FALSETOK 283 +#define BEGINTOK 284 +#define ENDTOK 285 +#define DECLARE 286 +#define GLOBAL 287 +#define CONSTANT 288 +#define SECTION 289 +#define VOLATILE 290 +#define TO 291 +#define DOTDOTDOT 292 +#define NULL_TOK 293 +#define UNDEF 294 +#define CONST 295 +#define INTERNAL 296 +#define LINKONCE 297 +#define WEAK 298 +#define APPENDING 299 +#define DLLIMPORT 300 +#define DLLEXPORT 301 +#define EXTERN_WEAK 302 +#define OPAQUE 303 +#define NOT 304 +#define EXTERNAL 305 +#define TARGET 306 +#define TRIPLE 307 +#define ENDIAN 308 +#define POINTERSIZE 309 +#define LITTLE 310 +#define BIG 311 +#define ALIGN 312 +#define DEPLIBS 313 +#define CALL 314 +#define TAIL 315 +#define ASM_TOK 316 +#define MODULE 317 +#define SIDEEFFECT 318 +#define CC_TOK 319 +#define CCC_TOK 320 +#define CSRETCC_TOK 321 +#define FASTCC_TOK 322 +#define COLDCC_TOK 323 +#define X86_STDCALLCC_TOK 324 +#define X86_FASTCALLCC_TOK 325 +#define DATALAYOUT 326 +#define RET 327 +#define BR 328 +#define SWITCH 329 +#define INVOKE 330 +#define UNREACHABLE 331 +#define UNWIND 332 +#define EXCEPT 333 +#define ADD 334 +#define SUB 335 +#define MUL 336 +#define DIV 337 +#define UDIV 338 +#define SDIV 339 +#define FDIV 340 +#define REM 341 +#define UREM 342 +#define SREM 343 +#define FREM 344 +#define AND 345 +#define OR 346 +#define XOR 347 +#define SHL 348 +#define SHR 349 +#define ASHR 350 +#define LSHR 351 +#define SETLE 352 +#define SETGE 353 +#define SETLT 354 +#define SETGT 355 +#define SETEQ 356 +#define SETNE 357 +#define ICMP 358 +#define FCMP 359 +#define MALLOC 360 +#define ALLOCA 361 +#define FREE 362 +#define LOAD 363 +#define STORE 364 +#define GETELEMENTPTR 365 +#define PHI_TOK 366 +#define SELECT 367 +#define VAARG 368 +#define EXTRACTELEMENT 369 +#define INSERTELEMENT 370 +#define SHUFFLEVECTOR 371 +#define VAARG_old 372 +#define VANEXT_old 373 +#define EQ 374 +#define NE 375 +#define SLT 376 +#define SGT 377 +#define SLE 378 +#define SGE 379 +#define ULT 380 +#define UGT 381 +#define ULE 382 +#define UGE 383 +#define OEQ 384 +#define ONE 385 +#define OLT 386 +#define OGT 387 +#define OLE 388 +#define OGE 389 +#define ORD 390 +#define UNO 391 +#define UEQ 392 +#define UNE 393 +#define CAST 394 +#define TRUNC 395 +#define ZEXT 396 +#define SEXT 397 +#define FPTRUNC 398 +#define FPEXT 399 +#define FPTOUI 400 +#define FPTOSI 401 +#define UITOFP 402 +#define SITOFP 403 +#define PTRTOINT 404 +#define INTTOPTR 405 +#define BITCAST 406 + + + + +/* Copy the first part of user declarations. */ +#line 14 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" #include "UpgradeInternals.h" #include "llvm/CallingConv.h" @@ -524,78 +743,6 @@ static Signedness getElementSign(const ConstInfo& CI, return result; } -/// This function determines if two function types differ only in their use of -/// the sret parameter attribute in the first argument. If they are identical -/// in all other respects, it returns true. Otherwise, it returns false. -static bool FuncTysDifferOnlyBySRet(const FunctionType *F1, - const FunctionType *F2) { - if (F1->getReturnType() != F2->getReturnType() || - F1->getNumParams() != F2->getNumParams()) - return false; - const ParamAttrsList *PAL1 = F1->getParamAttrs(); - const ParamAttrsList *PAL2 = F2->getParamAttrs(); - if (PAL1 && !PAL2 || PAL2 && !PAL1) - return false; - if (PAL1 && PAL2 && ((PAL1->size() != PAL2->size()) || - (PAL1->getParamAttrs(0) != PAL2->getParamAttrs(0)))) - return false; - unsigned SRetMask = ~unsigned(ParamAttr::StructRet); - for (unsigned i = 0; i < F1->getNumParams(); ++i) { - if (F1->getParamType(i) != F2->getParamType(i) || (PAL1 && PAL2 && - (unsigned(PAL1->getParamAttrs(i+1)) & SRetMask != - unsigned(PAL2->getParamAttrs(i+1)) & SRetMask))) - return false; - } - return true; -} - -/// This function determines if the type of V and Ty differ only by the SRet -/// parameter attribute. This is a more generalized case of -/// FuncTysDIfferOnlyBySRet since it doesn't require FunctionType arguments. -static bool TypesDifferOnlyBySRet(Value *V, const Type* Ty) { - if (V->getType() == Ty) - return true; - const PointerType *PF1 = dyn_cast(Ty); - const PointerType *PF2 = dyn_cast(V->getType()); - if (PF1 && PF2) { - const FunctionType* FT1 = dyn_cast(PF1->getElementType()); - const FunctionType* FT2 = dyn_cast(PF2->getElementType()); - if (FT1 && FT2) - return FuncTysDifferOnlyBySRet(FT1, FT2); - } - return false; -} - -// The upgrade of csretcc to sret param attribute may have caused a function -// to not be found because the param attribute changed the type of the called -// function. This helper function, used in getExistingValue, detects that -// situation and bitcasts the function to the correct type. -static Value* handleSRetFuncTypeMerge(Value *V, const Type* Ty) { - // Handle degenerate cases - if (!V) - return 0; - if (V->getType() == Ty) - return V; - - const PointerType *PF1 = dyn_cast(Ty); - const PointerType *PF2 = dyn_cast(V->getType()); - if (PF1 && PF2) { - const FunctionType *FT1 = dyn_cast(PF1->getElementType()); - const FunctionType *FT2 = dyn_cast(PF2->getElementType()); - if (FT1 && FT2 && FuncTysDifferOnlyBySRet(FT1, FT2)) { - const ParamAttrsList *PAL2 = FT2->getParamAttrs(); - if (PAL2 && PAL2->paramHasAttr(1, ParamAttr::StructRet)) - return V; - else if (Constant *C = dyn_cast(V)) - return ConstantExpr::getBitCast(C, PF1); - else - return new BitCastInst(V, PF1, "upgrd.cast", CurBB); - } - - } - return 0; -} - // getExistingValue - Look up the value specified by the provided type and // the provided ValID. If the value exists and has already been defined, return // it. Otherwise return null. @@ -642,8 +789,7 @@ static Value *getExistingValue(const Type *Ty, const ValID &D) { ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable(); V = SymTab.lookup(LookupName); if (V && V->getType() != Ty) - V = handleSRetFuncTypeMerge(V, Ty); - assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type"); + V = 0; } if (!V) { RenameMapType::const_iterator I = CurModule.RenameMap.find(Key); @@ -654,8 +800,7 @@ static Value *getExistingValue(const Type *Ty, const ValID &D) { LookupName = D.Name; V = CurModule.CurrentModule->getValueSymbolTable().lookup(LookupName); if (V && V->getType() != Ty) - V = handleSRetFuncTypeMerge(V, Ty); - assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type"); + V = 0; } if (!V) return 0; @@ -1901,8 +2046,29 @@ Module* UpgradeAssembly(const std::string &infile, std::istream& in, using namespace llvm; -#line 1754 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -typedef union { + +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif + +/* Enabling verbose error messages. */ +#ifdef YYERROR_VERBOSE +# undef YYERROR_VERBOSE +# define YYERROR_VERBOSE 1 +#else +# define YYERROR_VERBOSE 0 +#endif + +/* Enabling the token table. */ +#ifndef YYTOKEN_TABLE +# define YYTOKEN_TABLE 0 +#endif + +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE +#line 1680 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" +{ llvm::Module *ModuleVal; llvm::Function *FunctionVal; std::pair *ArgVal; @@ -1942,1124 +2108,1815 @@ typedef union { llvm::ICmpInst::Predicate IPred; llvm::FCmpInst::Predicate FPred; llvm::Module::Endianness Endianness; -} YYSTYPE; -#include +} +/* Line 187 of yacc.c. */ +#line 2114 "UpgradeParser.tab.c" + YYSTYPE; +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 +#endif + + + +/* Copy the second part of user declarations. */ + + +/* Line 216 of yacc.c. */ +#line 2127 "UpgradeParser.tab.c" -#ifndef __cplusplus -#ifndef __STDC__ -#define const +#ifdef short +# undef short #endif + +#ifdef YYTYPE_UINT8 +typedef YYTYPE_UINT8 yytype_uint8; +#else +typedef unsigned char yytype_uint8; #endif +#ifdef YYTYPE_INT8 +typedef YYTYPE_INT8 yytype_int8; +#elif (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +typedef signed char yytype_int8; +#else +typedef short int yytype_int8; +#endif +#ifdef YYTYPE_UINT16 +typedef YYTYPE_UINT16 yytype_uint16; +#else +typedef unsigned short int yytype_uint16; +#endif -#define YYFINAL 606 -#define YYFLAG -32768 -#define YYNTBASE 166 - -#define YYTRANSLATE(x) ((unsigned)(x) <= 405 ? yytranslate[x] : 246) - -static const short yytranslate[] = { 0, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 155, - 156, 164, 2, 153, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 160, - 152, 161, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 157, 154, 159, 2, 2, 2, 2, 2, 165, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 158, - 2, 2, 162, 2, 163, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 1, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, - 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, - 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, - 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, - 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, - 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, - 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, - 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, - 147, 148, 149, 150, 151 -}; +#ifdef YYTYPE_INT16 +typedef YYTYPE_INT16 yytype_int16; +#else +typedef short int yytype_int16; +#endif -#if YYDEBUG != 0 -static const short yyprhs[] = { 0, - 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, - 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, - 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, - 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, - 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, - 100, 102, 104, 106, 108, 110, 112, 114, 116, 118, - 120, 122, 124, 126, 128, 130, 132, 134, 136, 138, - 140, 142, 144, 146, 148, 150, 152, 154, 156, 158, - 161, 162, 164, 166, 168, 170, 172, 174, 176, 177, - 178, 180, 182, 184, 186, 188, 190, 193, 194, 197, - 198, 202, 205, 206, 208, 209, 213, 215, 218, 220, - 222, 224, 226, 228, 230, 232, 234, 236, 238, 240, - 242, 244, 246, 248, 250, 252, 254, 256, 258, 261, - 266, 272, 278, 282, 285, 291, 296, 299, 301, 305, - 307, 311, 313, 314, 319, 323, 327, 332, 337, 341, - 348, 354, 357, 360, 363, 366, 369, 372, 375, 378, - 381, 384, 391, 397, 406, 413, 420, 427, 435, 443, - 450, 457, 466, 475, 479, 481, 483, 485, 487, 490, - 493, 498, 501, 503, 508, 511, 516, 517, 525, 526, - 534, 535, 543, 544, 552, 556, 561, 562, 564, 566, - 568, 572, 576, 580, 584, 588, 592, 594, 595, 597, - 599, 601, 602, 605, 609, 611, 613, 617, 619, 620, - 629, 631, 633, 634, 639, 641, 643, 646, 647, 649, - 651, 652, 653, 659, 660, 662, 664, 666, 668, 670, - 672, 674, 676, 678, 682, 684, 690, 692, 694, 696, - 698, 701, 704, 707, 711, 714, 715, 717, 719, 721, - 724, 727, 731, 741, 751, 760, 774, 776, 778, 785, - 791, 794, 801, 809, 811, 815, 817, 818, 821, 823, - 829, 835, 841, 848, 855, 858, 863, 868, 875, 880, - 885, 890, 895, 902, 909, 912, 920, 922, 925, 926, - 928, 929, 933, 940, 944, 951, 954, 959, 966 -}; +#ifndef YYSIZE_T +# ifdef __SIZE_TYPE__ +# define YYSIZE_T __SIZE_TYPE__ +# elif defined size_t +# define YYSIZE_T size_t +# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# else +# define YYSIZE_T unsigned int +# endif +#endif -static const short yyrhs[] = { 5, - 0, 6, 0, 3, 0, 4, 0, 79, 0, 80, - 0, 81, 0, 82, 0, 83, 0, 84, 0, 85, - 0, 86, 0, 87, 0, 88, 0, 89, 0, 90, - 0, 91, 0, 92, 0, 97, 0, 98, 0, 99, - 0, 100, 0, 101, 0, 102, 0, 119, 0, 120, - 0, 121, 0, 122, 0, 123, 0, 124, 0, 125, - 0, 126, 0, 127, 0, 128, 0, 129, 0, 130, - 0, 131, 0, 132, 0, 133, 0, 134, 0, 135, - 0, 136, 0, 137, 0, 138, 0, 125, 0, 126, - 0, 127, 0, 128, 0, 27, 0, 28, 0, 93, - 0, 94, 0, 95, 0, 96, 0, 140, 0, 141, - 0, 142, 0, 143, 0, 144, 0, 145, 0, 146, - 0, 147, 0, 148, 0, 149, 0, 150, 0, 151, - 0, 139, 0, 16, 0, 14, 0, 12, 0, 10, - 0, 17, 0, 15, 0, 13, 0, 11, 0, 175, - 0, 176, 0, 18, 0, 19, 0, 211, 152, 0, - 0, 41, 0, 42, 0, 43, 0, 44, 0, 45, - 0, 46, 0, 47, 0, 0, 0, 65, 0, 66, - 0, 67, 0, 68, 0, 69, 0, 70, 0, 64, - 4, 0, 0, 57, 4, 0, 0, 153, 57, 4, - 0, 34, 24, 0, 0, 184, 0, 0, 153, 187, - 186, 0, 184, 0, 57, 4, 0, 190, 0, 8, - 0, 192, 0, 8, 0, 192, 0, 9, 0, 10, - 0, 11, 0, 12, 0, 13, 0, 14, 0, 15, - 0, 16, 0, 17, 0, 18, 0, 19, 0, 21, - 0, 191, 0, 48, 0, 228, 0, 154, 4, 0, - 189, 155, 194, 156, 0, 157, 4, 158, 192, 159, - 0, 160, 4, 158, 192, 161, 0, 162, 193, 163, - 0, 162, 163, 0, 160, 162, 193, 163, 161, 0, - 160, 162, 163, 161, 0, 192, 164, 0, 192, 0, - 193, 153, 192, 0, 193, 0, 193, 153, 37, 0, - 37, 0, 0, 190, 157, 197, 159, 0, 190, 157, - 159, 0, 190, 165, 24, 0, 190, 160, 197, 161, - 0, 190, 162, 197, 163, 0, 190, 162, 163, 0, - 190, 160, 162, 197, 163, 161, 0, 190, 160, 162, - 163, 161, 0, 190, 38, 0, 190, 39, 0, 190, - 228, 0, 190, 196, 0, 190, 26, 0, 175, 167, - 0, 176, 4, 0, 9, 27, 0, 9, 28, 0, - 178, 7, 0, 174, 155, 195, 36, 190, 156, 0, - 110, 155, 195, 243, 156, 0, 112, 155, 195, 153, - 195, 153, 195, 156, 0, 168, 155, 195, 153, 195, - 156, 0, 169, 155, 195, 153, 195, 156, 0, 170, - 155, 195, 153, 195, 156, 0, 103, 171, 155, 195, - 153, 195, 156, 0, 104, 172, 155, 195, 153, 195, - 156, 0, 173, 155, 195, 153, 195, 156, 0, 114, - 155, 195, 153, 195, 156, 0, 115, 155, 195, 153, - 195, 153, 195, 156, 0, 116, 155, 195, 153, 195, - 153, 195, 156, 0, 197, 153, 195, 0, 195, 0, - 32, 0, 33, 0, 200, 0, 200, 221, 0, 200, - 223, 0, 200, 62, 61, 206, 0, 200, 25, 0, - 201, 0, 201, 179, 20, 188, 0, 201, 223, 0, - 201, 62, 61, 206, 0, 0, 201, 179, 180, 198, - 195, 202, 186, 0, 0, 201, 179, 50, 198, 190, - 203, 186, 0, 0, 201, 179, 45, 198, 190, 204, - 186, 0, 0, 201, 179, 47, 198, 190, 205, 186, - 0, 201, 51, 208, 0, 201, 58, 152, 209, 0, - 0, 24, 0, 56, 0, 55, 0, 53, 152, 207, - 0, 54, 152, 4, 0, 52, 152, 24, 0, 71, - 152, 24, 0, 157, 210, 159, 0, 210, 153, 24, - 0, 24, 0, 0, 22, 0, 24, 0, 211, 0, - 0, 190, 212, 0, 214, 153, 213, 0, 213, 0, - 214, 0, 214, 153, 37, 0, 37, 0, 0, 181, - 188, 211, 155, 215, 156, 185, 182, 0, 29, 0, - 162, 0, 0, 180, 219, 216, 217, 0, 30, 0, - 163, 0, 231, 220, 0, 0, 45, 0, 47, 0, - 0, 0, 31, 224, 222, 225, 216, 0, 0, 63, - 0, 3, 0, 4, 0, 7, 0, 27, 0, 28, - 0, 38, 0, 39, 0, 26, 0, 160, 197, 161, - 0, 196, 0, 61, 226, 24, 153, 24, 0, 166, - 0, 211, 0, 228, 0, 227, 0, 190, 229, 0, - 231, 232, 0, 218, 232, 0, 233, 179, 235, 0, - 233, 237, 0, 0, 23, 0, 77, 0, 78, 0, - 72, 230, 0, 72, 8, 0, 73, 21, 229, 0, - 73, 9, 229, 153, 21, 229, 153, 21, 229, 0, - 74, 177, 229, 153, 21, 229, 157, 236, 159, 0, - 74, 177, 229, 153, 21, 229, 157, 159, 0, 75, - 181, 188, 229, 155, 240, 156, 36, 21, 229, 234, - 21, 229, 0, 234, 0, 76, 0, 236, 177, 227, - 153, 21, 229, 0, 177, 227, 153, 21, 229, 0, - 179, 242, 0, 190, 157, 229, 153, 229, 159, 0, - 238, 153, 157, 229, 153, 229, 159, 0, 230, 0, - 239, 153, 230, 0, 239, 0, 0, 60, 59, 0, - 59, 0, 168, 190, 229, 153, 229, 0, 169, 190, - 229, 153, 229, 0, 170, 190, 229, 153, 229, 0, - 103, 171, 190, 229, 153, 229, 0, 104, 172, 190, - 229, 153, 229, 0, 49, 230, 0, 173, 230, 153, - 230, 0, 174, 230, 36, 190, 0, 112, 230, 153, - 230, 153, 230, 0, 113, 230, 153, 190, 0, 117, - 230, 153, 190, 0, 118, 230, 153, 190, 0, 114, - 230, 153, 230, 0, 115, 230, 153, 230, 153, 230, - 0, 116, 230, 153, 230, 153, 230, 0, 111, 238, - 0, 241, 181, 188, 229, 155, 240, 156, 0, 245, - 0, 153, 239, 0, 0, 35, 0, 0, 105, 190, - 183, 0, 105, 190, 153, 15, 229, 183, 0, 106, - 190, 183, 0, 106, 190, 153, 15, 229, 183, 0, - 107, 230, 0, 244, 108, 190, 229, 0, 244, 109, - 230, 153, 190, 229, 0, 110, 190, 229, 243, 0 -}; +#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) + +#ifndef YY_ +# if YYENABLE_NLS +# if ENABLE_NLS +# include /* INFRINGES ON USER NAME SPACE */ +# define YY_(msgid) dgettext ("bison-runtime", msgid) +# endif +# endif +# ifndef YY_ +# define YY_(msgid) msgid +# endif +#endif +/* Suppress unused-variable warnings by "using" E. */ +#if ! defined lint || defined __GNUC__ +# define YYUSE(e) ((void) (e)) +#else +# define YYUSE(e) /* empty */ #endif -#if YYDEBUG != 0 -static const short yyrline[] = { 0, - 1894, 1895, 1903, 1904, 1914, 1914, 1914, 1914, 1914, 1914, - 1914, 1914, 1914, 1914, 1914, 1918, 1918, 1918, 1922, 1922, - 1922, 1922, 1922, 1922, 1926, 1926, 1927, 1927, 1928, 1928, - 1929, 1929, 1930, 1930, 1934, 1934, 1935, 1935, 1936, 1936, - 1937, 1937, 1938, 1938, 1939, 1939, 1940, 1940, 1941, 1942, - 1945, 1945, 1945, 1945, 1949, 1949, 1949, 1949, 1949, 1949, - 1949, 1950, 1950, 1950, 1950, 1950, 1950, 1956, 1956, 1956, - 1956, 1960, 1960, 1960, 1960, 1964, 1964, 1968, 1968, 1973, - 1976, 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1992, - 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2009, 2010, 2018, - 2019, 2027, 2036, 2037, 2044, 2045, 2049, 2053, 2069, 2070, - 2077, 2078, 2085, 2093, 2093, 2093, 2093, 2093, 2093, 2093, - 2094, 2094, 2094, 2094, 2094, 2099, 2103, 2107, 2112, 2121, - 2148, 2154, 2167, 2178, 2182, 2195, 2199, 2213, 2217, 2224, - 2225, 2231, 2238, 2250, 2280, 2293, 2316, 2344, 2366, 2377, - 2399, 2410, 2419, 2424, 2483, 2490, 2498, 2505, 2512, 2516, - 2520, 2534, 2549, 2561, 2570, 2598, 2611, 2620, 2626, 2632, - 2643, 2649, 2655, 2666, 2667, 2676, 2677, 2689, 2698, 2699, - 2700, 2701, 2702, 2718, 2738, 2740, 2742, 2746, 2749, 2754, - 2757, 2762, 2765, 2771, 2774, 2776, 2778, 2783, 2797, 2798, - 2802, 2805, 2813, 2817, 2824, 2828, 2832, 2836, 2844, 2844, - 2848, 2849, 2853, 2861, 2866, 2874, 2875, 2882, 2889, 2893, - 3083, 3083, 3087, 3087, 3097, 3097, 3101, 3106, 3107, 3108, - 3112, 3113, 3113, 3125, 3126, 3131, 3132, 3133, 3134, 3138, - 3142, 3143, 3144, 3145, 3166, 3170, 3184, 3185, 3190, 3190, - 3198, 3208, 3211, 3220, 3231, 3236, 3245, 3256, 3256, 3259, - 3263, 3267, 3272, 3282, 3300, 3309, 3383, 3387, 3394, 3406, - 3421, 3451, 3461, 3471, 3475, 3482, 3483, 3487, 3490, 3496, - 3515, 3533, 3549, 3563, 3577, 3588, 3606, 3615, 3624, 3631, - 3652, 3676, 3682, 3688, 3694, 3710, 3803, 3811, 3812, 3816, - 3817, 3821, 3827, 3834, 3840, 3847, 3854, 3867, 3893 -}; +/* Identity function, used to suppress warnings about constant conditions. */ +#ifndef lint +# define YYID(n) (n) +#else +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static int +YYID (int i) +#else +static int +YYID (i) + int i; +#endif +{ + return i; +} #endif +#if ! defined yyoverflow || YYERROR_VERBOSE + +/* The parser invokes alloca or malloc; define the necessary symbols. */ + +# ifdef YYSTACK_USE_ALLOCA +# if YYSTACK_USE_ALLOCA +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca +# elif defined __BUILTIN_VA_ARG_INCR +# include /* INFRINGES ON USER NAME SPACE */ +# elif defined _AIX +# define YYSTACK_ALLOC __alloca +# elif defined _MSC_VER +# include /* INFRINGES ON USER NAME SPACE */ +# define alloca _alloca +# else +# define YYSTACK_ALLOC alloca +# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif +# endif +# endif +# endif + +# ifdef YYSTACK_ALLOC + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) +# ifndef YYSTACK_ALLOC_MAXIMUM + /* The OS might guarantee only one guard page at the bottom of the stack, + and a page size can be as small as 4096 bytes. So we cannot safely + invoke alloca (N) if N exceeds 4096. Use a slightly smaller number + to allow for a few compiler-allocated temporary stack slots. */ +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ +# endif +# else +# define YYSTACK_ALLOC YYMALLOC +# define YYSTACK_FREE YYFREE +# ifndef YYSTACK_ALLOC_MAXIMUM +# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM +# endif +# if (defined __cplusplus && ! defined _STDLIB_H \ + && ! ((defined YYMALLOC || defined malloc) \ + && (defined YYFREE || defined free))) +# include /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifndef YYFREE +# define YYFREE free +# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void free (void *); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# endif +#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ + + +#if (! defined yyoverflow \ + && (! defined __cplusplus \ + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + +/* A type that is properly aligned for any stack member. */ +union yyalloc +{ + yytype_int16 yyss; + YYSTYPE yyvs; + }; + +/* The size of the maximum gap between one aligned stack and the next. */ +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) + +/* The size of an array large to enough to hold all stacks, each with + N elements. */ +# define YYSTACK_BYTES(N) \ + ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + + YYSTACK_GAP_MAXIMUM) + +/* Copy COUNT objects from FROM to TO. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(To, From, Count) \ + __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# else +# define YYCOPY(To, From, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ + while (YYID (0)) +# endif +# endif + +/* Relocate STACK from its old location to the new one. The + local variables YYSIZE and YYSTACKSIZE give the old and new number of + elements in the stack, and YYPTR gives the new location of the + stack. Advance YYPTR to a properly aligned location for the next + stack. */ +# define YYSTACK_RELOCATE(Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack, Stack, yysize); \ + Stack = &yyptr->Stack; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (YYID (0)) -#if YYDEBUG != 0 || defined (YYERROR_VERBOSE) - -static const char * const yytname[] = { "$","error","$undefined.","ESINT64VAL", -"EUINT64VAL","SINTVAL","UINTVAL","FPVAL","VOID","BOOL","SBYTE","UBYTE","SHORT", -"USHORT","INT","UINT","LONG","ULONG","FLOAT","DOUBLE","TYPE","LABEL","VAR_ID", -"LABELSTR","STRINGCONSTANT","IMPLEMENTATION","ZEROINITIALIZER","TRUETOK","FALSETOK", -"BEGINTOK","ENDTOK","DECLARE","GLOBAL","CONSTANT","SECTION","VOLATILE","TO", -"DOTDOTDOT","NULL_TOK","UNDEF","CONST","INTERNAL","LINKONCE","WEAK","APPENDING", -"DLLIMPORT","DLLEXPORT","EXTERN_WEAK","OPAQUE","NOT","EXTERNAL","TARGET","TRIPLE", -"ENDIAN","POINTERSIZE","LITTLE","BIG","ALIGN","DEPLIBS","CALL","TAIL","ASM_TOK", -"MODULE","SIDEEFFECT","CC_TOK","CCC_TOK","CSRETCC_TOK","FASTCC_TOK","COLDCC_TOK", -"X86_STDCALLCC_TOK","X86_FASTCALLCC_TOK","DATALAYOUT","RET","BR","SWITCH","INVOKE", -"UNREACHABLE","UNWIND","EXCEPT","ADD","SUB","MUL","DIV","UDIV","SDIV","FDIV", -"REM","UREM","SREM","FREM","AND","OR","XOR","SHL","SHR","ASHR","LSHR","SETLE", -"SETGE","SETLT","SETGT","SETEQ","SETNE","ICMP","FCMP","MALLOC","ALLOCA","FREE", -"LOAD","STORE","GETELEMENTPTR","PHI_TOK","SELECT","VAARG","EXTRACTELEMENT","INSERTELEMENT", -"SHUFFLEVECTOR","VAARG_old","VANEXT_old","EQ","NE","SLT","SGT","SLE","SGE","ULT", -"UGT","ULE","UGE","OEQ","ONE","OLT","OGT","OLE","OGE","ORD","UNO","UEQ","UNE", -"CAST","TRUNC","ZEXT","SEXT","FPTRUNC","FPEXT","FPTOUI","FPTOSI","UITOFP","SITOFP", -"PTRTOINT","INTTOPTR","BITCAST","'='","','","'\\\\'","'('","')'","'['","'x'", -"']'","'<'","'>'","'{'","'}'","'*'","'c'","INTVAL","EINT64VAL","ArithmeticOps", -"LogicalOps","SetCondOps","IPredicates","FPredicates","ShiftOps","CastOps","SIntType", -"UIntType","IntType","FPType","OptAssign","OptLinkage","OptCallingConv","OptAlign", -"OptCAlign","SectionString","OptSection","GlobalVarAttributes","GlobalVarAttribute", -"TypesV","UpRTypesV","Types","PrimType","UpRTypes","TypeListI","ArgTypeListI", -"ConstVal","ConstExpr","ConstVector","GlobalType","Module","FunctionList","ConstPool", -"@1","@2","@3","@4","AsmBlock","BigOrLittle","TargetDefinition","LibrariesDefinition", -"LibList","Name","OptName","ArgVal","ArgListH","ArgList","FunctionHeaderH","BEGIN", -"FunctionHeader","@5","END","Function","FnDeclareLinkage","FunctionProto","@6", -"@7","OptSideEffect","ConstValueRef","SymbolicValueRef","ValueRef","ResolvedVal", -"BasicBlockList","BasicBlock","InstructionList","Unwind","BBTerminatorInst", -"JumpTable","Inst","PHIList","ValueRefList","ValueRefListE","OptTailCall","InstVal", -"IndexList","OptVolatile","MemoryInst", NULL -}; #endif -static const short yyr1[] = { 0, - 166, 166, 167, 167, 168, 168, 168, 168, 168, 168, - 168, 168, 168, 168, 168, 169, 169, 169, 170, 170, - 170, 170, 170, 170, 171, 171, 171, 171, 171, 171, - 171, 171, 171, 171, 172, 172, 172, 172, 172, 172, - 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, - 173, 173, 173, 173, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 175, 175, 175, - 175, 176, 176, 176, 176, 177, 177, 178, 178, 179, - 179, 180, 180, 180, 180, 180, 180, 180, 180, 181, - 181, 181, 181, 181, 181, 181, 181, 182, 182, 183, - 183, 184, 185, 185, 186, 186, 187, 187, 188, 188, - 189, 189, 190, 191, 191, 191, 191, 191, 191, 191, - 191, 191, 191, 191, 191, 192, 192, 192, 192, 192, - 192, 192, 192, 192, 192, 192, 192, 193, 193, 194, - 194, 194, 194, 195, 195, 195, 195, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 195, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 197, 197, 198, 198, 199, 200, 200, - 200, 200, 200, 201, 201, 201, 202, 201, 203, 201, - 204, 201, 205, 201, 201, 201, 201, 206, 207, 207, - 208, 208, 208, 208, 209, 210, 210, 210, 211, 211, - 212, 212, 213, 214, 214, 215, 215, 215, 215, 216, - 217, 217, 219, 218, 220, 220, 221, 222, 222, 222, - 224, 225, 223, 226, 226, 227, 227, 227, 227, 227, - 227, 227, 227, 227, 227, 227, 228, 228, 229, 229, - 230, 231, 231, 232, 233, 233, 233, 234, 234, 235, - 235, 235, 235, 235, 235, 235, 235, 235, 236, 236, - 237, 238, 238, 239, 239, 240, 240, 241, 241, 242, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 243, 243, 244, - 244, 245, 245, 245, 245, 245, 245, 245, 245 +/* YYFINAL -- State number of the termination state. */ +#define YYFINAL 4 +/* YYLAST -- Last index in YYTABLE. */ +#define YYLAST 1630 + +/* YYNTOKENS -- Number of terminals. */ +#define YYNTOKENS 166 +/* YYNNTS -- Number of nonterminals. */ +#define YYNNTS 81 +/* YYNRULES -- Number of rules. */ +#define YYNRULES 310 +/* YYNRULES -- Number of states. */ +#define YYNSTATES 606 + +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +#define YYUNDEFTOK 2 +#define YYMAXUTOK 406 + +#define YYTRANSLATE(YYX) \ + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +static const yytype_uint8 yytranslate[] = +{ + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 155, 156, 164, 2, 153, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 160, 152, 161, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 157, 154, 159, 2, 2, 2, 2, 2, 165, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 158, 2, 2, 162, 2, 163, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, + 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, + 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, + 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, + 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, + 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, + 145, 146, 147, 148, 149, 150, 151 +}; + +#if YYDEBUG +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in + YYRHS. */ +static const yytype_uint16 yyprhs[] = +{ + 0, 0, 3, 5, 7, 9, 11, 13, 15, 17, + 19, 21, 23, 25, 27, 29, 31, 33, 35, 37, + 39, 41, 43, 45, 47, 49, 51, 53, 55, 57, + 59, 61, 63, 65, 67, 69, 71, 73, 75, 77, + 79, 81, 83, 85, 87, 89, 91, 93, 95, 97, + 99, 101, 103, 105, 107, 109, 111, 113, 115, 117, + 119, 121, 123, 125, 127, 129, 131, 133, 135, 137, + 139, 141, 143, 145, 147, 149, 151, 153, 155, 157, + 159, 161, 164, 165, 167, 169, 171, 173, 175, 177, + 179, 180, 181, 183, 185, 187, 189, 191, 193, 196, + 197, 200, 201, 205, 208, 209, 211, 212, 216, 218, + 221, 223, 225, 227, 229, 231, 233, 235, 237, 239, + 241, 243, 245, 247, 249, 251, 253, 255, 257, 259, + 261, 264, 269, 275, 281, 285, 288, 294, 299, 302, + 304, 308, 310, 314, 316, 317, 322, 326, 330, 335, + 340, 344, 351, 357, 360, 363, 366, 369, 372, 375, + 378, 381, 384, 387, 394, 400, 409, 416, 423, 430, + 438, 446, 453, 460, 469, 478, 482, 484, 486, 488, + 490, 493, 496, 501, 504, 506, 511, 514, 519, 520, + 528, 529, 537, 538, 546, 547, 555, 559, 564, 565, + 567, 569, 571, 575, 579, 583, 587, 591, 595, 597, + 598, 600, 602, 604, 605, 608, 612, 614, 616, 620, + 622, 623, 632, 634, 636, 637, 642, 644, 646, 649, + 650, 652, 654, 655, 656, 662, 663, 665, 667, 669, + 671, 673, 675, 677, 679, 681, 685, 687, 693, 695, + 697, 699, 701, 704, 707, 710, 714, 717, 718, 720, + 722, 724, 727, 730, 734, 744, 754, 763, 777, 779, + 781, 788, 794, 797, 804, 812, 814, 818, 820, 821, + 824, 826, 832, 838, 844, 851, 858, 861, 866, 871, + 878, 883, 888, 893, 898, 905, 912, 915, 923, 925, + 928, 929, 931, 932, 936, 943, 947, 954, 957, 962, + 969 }; -static const short yyr2[] = { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, - 1, 1, 1, 1, 1, 1, 2, 0, 2, 0, - 3, 2, 0, 1, 0, 3, 1, 2, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 4, - 5, 5, 3, 2, 5, 4, 2, 1, 3, 1, - 3, 1, 0, 4, 3, 3, 4, 4, 3, 6, - 5, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 6, 5, 8, 6, 6, 6, 7, 7, 6, - 6, 8, 8, 3, 1, 1, 1, 1, 2, 2, - 4, 2, 1, 4, 2, 4, 0, 7, 0, 7, - 0, 7, 0, 7, 3, 4, 0, 1, 1, 1, - 3, 3, 3, 3, 3, 3, 1, 0, 1, 1, - 1, 0, 2, 3, 1, 1, 3, 1, 0, 8, - 1, 1, 0, 4, 1, 1, 2, 0, 1, 1, - 0, 0, 5, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 3, 1, 5, 1, 1, 1, 1, - 2, 2, 2, 3, 2, 0, 1, 1, 1, 2, - 2, 3, 9, 9, 8, 13, 1, 1, 6, 5, - 2, 6, 7, 1, 3, 1, 0, 2, 1, 5, - 5, 5, 6, 6, 2, 4, 4, 6, 4, 4, - 4, 4, 6, 6, 2, 7, 1, 2, 0, 1, - 0, 3, 6, 3, 6, 2, 4, 6, 4 +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yytype_int16 yyrhs[] = +{ + 200, 0, -1, 5, -1, 6, -1, 3, -1, 4, + -1, 79, -1, 80, -1, 81, -1, 82, -1, 83, + -1, 84, -1, 85, -1, 86, -1, 87, -1, 88, + -1, 89, -1, 90, -1, 91, -1, 92, -1, 97, + -1, 98, -1, 99, -1, 100, -1, 101, -1, 102, + -1, 119, -1, 120, -1, 121, -1, 122, -1, 123, + -1, 124, -1, 125, -1, 126, -1, 127, -1, 128, + -1, 129, -1, 130, -1, 131, -1, 132, -1, 133, + -1, 134, -1, 135, -1, 136, -1, 137, -1, 138, + -1, 125, -1, 126, -1, 127, -1, 128, -1, 27, + -1, 28, -1, 93, -1, 94, -1, 95, -1, 96, + -1, 140, -1, 141, -1, 142, -1, 143, -1, 144, + -1, 145, -1, 146, -1, 147, -1, 148, -1, 149, + -1, 150, -1, 151, -1, 139, -1, 16, -1, 14, + -1, 12, -1, 10, -1, 17, -1, 15, -1, 13, + -1, 11, -1, 176, -1, 177, -1, 18, -1, 19, + -1, 212, 152, -1, -1, 41, -1, 42, -1, 43, + -1, 44, -1, 45, -1, 46, -1, 47, -1, -1, + -1, 65, -1, 66, -1, 67, -1, 68, -1, 69, + -1, 70, -1, 64, 4, -1, -1, 57, 4, -1, + -1, 153, 57, 4, -1, 34, 24, -1, -1, 185, + -1, -1, 153, 188, 187, -1, 185, -1, 57, 4, + -1, 191, -1, 8, -1, 193, -1, 8, -1, 193, + -1, 9, -1, 10, -1, 11, -1, 12, -1, 13, + -1, 14, -1, 15, -1, 16, -1, 17, -1, 18, + -1, 19, -1, 21, -1, 192, -1, 48, -1, 229, + -1, 154, 4, -1, 190, 155, 195, 156, -1, 157, + 4, 158, 193, 159, -1, 160, 4, 158, 193, 161, + -1, 162, 194, 163, -1, 162, 163, -1, 160, 162, + 194, 163, 161, -1, 160, 162, 163, 161, -1, 193, + 164, -1, 193, -1, 194, 153, 193, -1, 194, -1, + 194, 153, 37, -1, 37, -1, -1, 191, 157, 198, + 159, -1, 191, 157, 159, -1, 191, 165, 24, -1, + 191, 160, 198, 161, -1, 191, 162, 198, 163, -1, + 191, 162, 163, -1, 191, 160, 162, 198, 163, 161, + -1, 191, 160, 162, 163, 161, -1, 191, 38, -1, + 191, 39, -1, 191, 229, -1, 191, 197, -1, 191, + 26, -1, 176, 168, -1, 177, 4, -1, 9, 27, + -1, 9, 28, -1, 179, 7, -1, 175, 155, 196, + 36, 191, 156, -1, 110, 155, 196, 244, 156, -1, + 112, 155, 196, 153, 196, 153, 196, 156, -1, 169, + 155, 196, 153, 196, 156, -1, 170, 155, 196, 153, + 196, 156, -1, 171, 155, 196, 153, 196, 156, -1, + 103, 172, 155, 196, 153, 196, 156, -1, 104, 173, + 155, 196, 153, 196, 156, -1, 174, 155, 196, 153, + 196, 156, -1, 114, 155, 196, 153, 196, 156, -1, + 115, 155, 196, 153, 196, 153, 196, 156, -1, 116, + 155, 196, 153, 196, 153, 196, 156, -1, 198, 153, + 196, -1, 196, -1, 32, -1, 33, -1, 201, -1, + 201, 222, -1, 201, 224, -1, 201, 62, 61, 207, + -1, 201, 25, -1, 202, -1, 202, 180, 20, 189, + -1, 202, 224, -1, 202, 62, 61, 207, -1, -1, + 202, 180, 181, 199, 196, 203, 187, -1, -1, 202, + 180, 50, 199, 191, 204, 187, -1, -1, 202, 180, + 45, 199, 191, 205, 187, -1, -1, 202, 180, 47, + 199, 191, 206, 187, -1, 202, 51, 209, -1, 202, + 58, 152, 210, -1, -1, 24, -1, 56, -1, 55, + -1, 53, 152, 208, -1, 54, 152, 4, -1, 52, + 152, 24, -1, 71, 152, 24, -1, 157, 211, 159, + -1, 211, 153, 24, -1, 24, -1, -1, 22, -1, + 24, -1, 212, -1, -1, 191, 213, -1, 215, 153, + 214, -1, 214, -1, 215, -1, 215, 153, 37, -1, + 37, -1, -1, 182, 189, 212, 155, 216, 156, 186, + 183, -1, 29, -1, 162, -1, -1, 181, 220, 217, + 218, -1, 30, -1, 163, -1, 232, 221, -1, -1, + 45, -1, 47, -1, -1, -1, 31, 225, 223, 226, + 217, -1, -1, 63, -1, 3, -1, 4, -1, 7, + -1, 27, -1, 28, -1, 38, -1, 39, -1, 26, + -1, 160, 198, 161, -1, 197, -1, 61, 227, 24, + 153, 24, -1, 167, -1, 212, -1, 229, -1, 228, + -1, 191, 230, -1, 232, 233, -1, 219, 233, -1, + 234, 180, 236, -1, 234, 238, -1, -1, 23, -1, + 77, -1, 78, -1, 72, 231, -1, 72, 8, -1, + 73, 21, 230, -1, 73, 9, 230, 153, 21, 230, + 153, 21, 230, -1, 74, 178, 230, 153, 21, 230, + 157, 237, 159, -1, 74, 178, 230, 153, 21, 230, + 157, 159, -1, 75, 182, 189, 230, 155, 241, 156, + 36, 21, 230, 235, 21, 230, -1, 235, -1, 76, + -1, 237, 178, 228, 153, 21, 230, -1, 178, 228, + 153, 21, 230, -1, 180, 243, -1, 191, 157, 230, + 153, 230, 159, -1, 239, 153, 157, 230, 153, 230, + 159, -1, 231, -1, 240, 153, 231, -1, 240, -1, + -1, 60, 59, -1, 59, -1, 169, 191, 230, 153, + 230, -1, 170, 191, 230, 153, 230, -1, 171, 191, + 230, 153, 230, -1, 103, 172, 191, 230, 153, 230, + -1, 104, 173, 191, 230, 153, 230, -1, 49, 231, + -1, 174, 231, 153, 231, -1, 175, 231, 36, 191, + -1, 112, 231, 153, 231, 153, 231, -1, 113, 231, + 153, 191, -1, 117, 231, 153, 191, -1, 118, 231, + 153, 191, -1, 114, 231, 153, 231, -1, 115, 231, + 153, 231, 153, 231, -1, 116, 231, 153, 231, 153, + 231, -1, 111, 239, -1, 242, 182, 189, 230, 155, + 241, 156, -1, 246, -1, 153, 240, -1, -1, 35, + -1, -1, 105, 191, 184, -1, 105, 191, 153, 15, + 230, 184, -1, 106, 191, 184, -1, 106, 191, 153, + 15, 230, 184, -1, 107, 231, -1, 245, 108, 191, + 230, -1, 245, 109, 231, 153, 191, 230, -1, 110, + 191, 230, 244, -1 }; -static const short yydefact[] = { 197, - 89, 183, 182, 231, 82, 83, 84, 85, 86, 87, - 88, 0, 223, 256, 179, 180, 256, 209, 210, 0, - 0, 0, 89, 0, 185, 228, 0, 90, 257, 253, - 81, 225, 226, 227, 252, 0, 0, 0, 0, 195, - 0, 0, 0, 0, 0, 0, 0, 80, 229, 230, - 232, 198, 181, 0, 91, 92, 93, 94, 95, 96, - 0, 0, 301, 255, 0, 0, 0, 0, 208, 196, - 186, 1, 2, 110, 114, 115, 116, 117, 118, 119, - 120, 121, 122, 123, 124, 125, 127, 0, 0, 0, - 0, 247, 184, 0, 109, 126, 113, 248, 128, 176, - 177, 0, 0, 0, 0, 90, 97, 0, 221, 222, - 224, 300, 0, 279, 0, 0, 0, 0, 90, 268, - 258, 259, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 51, 52, 53, 54, - 19, 20, 21, 22, 23, 24, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 67, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 0, 0, 0, 0, 0, 267, 254, - 90, 271, 0, 297, 203, 200, 199, 201, 202, 204, - 207, 0, 129, 0, 0, 0, 112, 134, 138, 0, - 143, 137, 191, 193, 189, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 124, 0, 0, 0, 0, - 187, 233, 0, 0, 285, 278, 261, 260, 0, 0, - 71, 75, 70, 74, 69, 73, 68, 72, 76, 77, - 0, 0, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 0, 49, 50, 45, 46, 47, 48, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 44, 0, - 100, 100, 306, 0, 0, 295, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 205, 0, 0, 0, 0, 0, 133, 142, - 140, 0, 105, 105, 105, 159, 160, 3, 4, 157, - 158, 161, 156, 152, 153, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 155, 154, 105, 219, 236, 237, 238, 243, 239, - 240, 241, 242, 234, 0, 245, 250, 249, 251, 0, - 262, 0, 0, 0, 0, 0, 302, 0, 304, 299, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 206, 111, 111, - 136, 0, 139, 0, 130, 0, 192, 194, 190, 0, - 0, 0, 0, 0, 0, 0, 145, 175, 0, 0, - 0, 149, 0, 146, 0, 0, 0, 0, 0, 188, - 218, 212, 215, 216, 0, 235, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 309, 0, 0, - 0, 289, 292, 0, 0, 290, 291, 0, 0, 0, - 286, 287, 0, 307, 0, 131, 132, 135, 141, 0, - 0, 107, 105, 0, 0, 299, 0, 0, 0, 0, - 0, 144, 134, 113, 0, 147, 148, 0, 0, 0, - 0, 0, 211, 213, 0, 103, 0, 244, 0, 0, - 277, 0, 0, 100, 101, 100, 274, 298, 0, 0, - 0, 0, 0, 280, 281, 282, 277, 0, 102, 108, - 106, 0, 0, 0, 0, 0, 0, 0, 174, 151, - 0, 0, 0, 0, 0, 0, 217, 214, 104, 98, - 0, 0, 0, 276, 0, 283, 284, 0, 303, 305, - 0, 0, 0, 288, 293, 294, 0, 308, 0, 0, - 163, 0, 0, 0, 0, 150, 0, 0, 0, 0, - 0, 0, 220, 246, 0, 0, 0, 275, 272, 0, - 296, 0, 0, 0, 171, 0, 0, 165, 166, 167, - 170, 162, 99, 0, 265, 0, 0, 0, 273, 168, - 169, 0, 0, 0, 263, 0, 264, 0, 0, 164, - 172, 173, 0, 0, 0, 0, 0, 0, 270, 0, - 0, 269, 266, 0, 0, 0 +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +static const yytype_uint16 yyrline[] = +{ + 0, 1820, 1820, 1821, 1829, 1830, 1840, 1840, 1840, 1840, + 1840, 1840, 1840, 1840, 1840, 1840, 1840, 1844, 1844, 1844, + 1848, 1848, 1848, 1848, 1848, 1848, 1852, 1852, 1853, 1853, + 1854, 1854, 1855, 1855, 1856, 1856, 1860, 1860, 1861, 1861, + 1862, 1862, 1863, 1863, 1864, 1864, 1865, 1865, 1866, 1866, + 1867, 1868, 1871, 1871, 1871, 1871, 1875, 1875, 1875, 1875, + 1875, 1875, 1875, 1876, 1876, 1876, 1876, 1876, 1876, 1882, + 1882, 1882, 1882, 1886, 1886, 1886, 1886, 1890, 1890, 1894, + 1894, 1899, 1902, 1907, 1908, 1909, 1910, 1911, 1912, 1913, + 1914, 1918, 1919, 1920, 1921, 1922, 1923, 1924, 1925, 1935, + 1936, 1944, 1945, 1953, 1962, 1963, 1970, 1971, 1975, 1979, + 1995, 1996, 2003, 2004, 2011, 2019, 2019, 2019, 2019, 2019, + 2019, 2019, 2020, 2020, 2020, 2020, 2020, 2025, 2029, 2033, + 2038, 2047, 2074, 2080, 2093, 2104, 2108, 2121, 2125, 2139, + 2143, 2150, 2151, 2157, 2164, 2176, 2206, 2219, 2242, 2270, + 2292, 2303, 2325, 2336, 2345, 2350, 2409, 2416, 2424, 2431, + 2438, 2442, 2446, 2460, 2475, 2487, 2496, 2524, 2537, 2546, + 2552, 2558, 2569, 2575, 2581, 2592, 2593, 2602, 2603, 2615, + 2624, 2625, 2626, 2627, 2628, 2644, 2664, 2666, 2668, 2668, + 2675, 2675, 2683, 2683, 2691, 2691, 2700, 2702, 2704, 2709, + 2723, 2724, 2728, 2731, 2739, 2743, 2750, 2754, 2758, 2762, + 2770, 2770, 2774, 2775, 2779, 2787, 2792, 2800, 2801, 2808, + 2815, 2819, 3007, 3007, 3011, 3011, 3021, 3021, 3025, 3030, + 3031, 3032, 3036, 3037, 3036, 3049, 3050, 3055, 3056, 3057, + 3058, 3062, 3066, 3067, 3068, 3069, 3090, 3094, 3108, 3109, + 3114, 3114, 3122, 3132, 3135, 3144, 3155, 3160, 3169, 3180, + 3180, 3183, 3187, 3191, 3196, 3206, 3224, 3233, 3306, 3310, + 3317, 3329, 3344, 3374, 3384, 3394, 3398, 3405, 3406, 3410, + 3413, 3419, 3438, 3456, 3472, 3486, 3500, 3511, 3529, 3538, + 3547, 3554, 3575, 3599, 3605, 3611, 3617, 3633, 3725, 3733, + 3734, 3738, 3739, 3743, 3749, 3756, 3762, 3769, 3776, 3789, + 3809 }; +#endif -static const short yydefgoto[] = { 92, - 310, 327, 328, 329, 253, 270, 330, 331, 217, 218, - 241, 219, 23, 13, 61, 553, 357, 452, 520, 387, - 453, 93, 94, 220, 96, 97, 200, 302, 398, 346, - 399, 102, 604, 1, 2, 334, 305, 303, 304, 53, - 188, 40, 70, 192, 98, 474, 413, 414, 415, 62, - 111, 14, 28, 34, 15, 51, 16, 26, 106, 417, - 347, 99, 349, 487, 17, 30, 31, 179, 180, 577, - 64, 276, 524, 525, 181, 182, 428, 183, 184 +#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +static const char *const yytname[] = +{ + "$end", "error", "$undefined", "ESINT64VAL", "EUINT64VAL", "SINTVAL", + "UINTVAL", "FPVAL", "VOID", "BOOL", "SBYTE", "UBYTE", "SHORT", "USHORT", + "INT", "UINT", "LONG", "ULONG", "FLOAT", "DOUBLE", "TYPE", "LABEL", + "VAR_ID", "LABELSTR", "STRINGCONSTANT", "IMPLEMENTATION", + "ZEROINITIALIZER", "TRUETOK", "FALSETOK", "BEGINTOK", "ENDTOK", + "DECLARE", "GLOBAL", "CONSTANT", "SECTION", "VOLATILE", "TO", + "DOTDOTDOT", "NULL_TOK", "UNDEF", "CONST", "INTERNAL", "LINKONCE", + "WEAK", "APPENDING", "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "OPAQUE", + "NOT", "EXTERNAL", "TARGET", "TRIPLE", "ENDIAN", "POINTERSIZE", "LITTLE", + "BIG", "ALIGN", "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE", + "SIDEEFFECT", "CC_TOK", "CCC_TOK", "CSRETCC_TOK", "FASTCC_TOK", + "COLDCC_TOK", "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", "DATALAYOUT", + "RET", "BR", "SWITCH", "INVOKE", "UNREACHABLE", "UNWIND", "EXCEPT", + "ADD", "SUB", "MUL", "DIV", "UDIV", "SDIV", "FDIV", "REM", "UREM", + "SREM", "FREM", "AND", "OR", "XOR", "SHL", "SHR", "ASHR", "LSHR", + "SETLE", "SETGE", "SETLT", "SETGT", "SETEQ", "SETNE", "ICMP", "FCMP", + "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE", "GETELEMENTPTR", "PHI_TOK", + "SELECT", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR", + "VAARG_old", "VANEXT_old", "EQ", "NE", "SLT", "SGT", "SLE", "SGE", "ULT", + "UGT", "ULE", "UGE", "OEQ", "ONE", "OLT", "OGT", "OLE", "OGE", "ORD", + "UNO", "UEQ", "UNE", "CAST", "TRUNC", "ZEXT", "SEXT", "FPTRUNC", "FPEXT", + "FPTOUI", "FPTOSI", "UITOFP", "SITOFP", "PTRTOINT", "INTTOPTR", + "BITCAST", "'='", "','", "'\\\\'", "'('", "')'", "'['", "'x'", "']'", + "'<'", "'>'", "'{'", "'}'", "'*'", "'c'", "$accept", "INTVAL", + "EINT64VAL", "ArithmeticOps", "LogicalOps", "SetCondOps", "IPredicates", + "FPredicates", "ShiftOps", "CastOps", "SIntType", "UIntType", "IntType", + "FPType", "OptAssign", "OptLinkage", "OptCallingConv", "OptAlign", + "OptCAlign", "SectionString", "OptSection", "GlobalVarAttributes", + "GlobalVarAttribute", "TypesV", "UpRTypesV", "Types", "PrimType", + "UpRTypes", "TypeListI", "ArgTypeListI", "ConstVal", "ConstExpr", + "ConstVector", "GlobalType", "Module", "FunctionList", "ConstPool", "@1", + "@2", "@3", "@4", "AsmBlock", "BigOrLittle", "TargetDefinition", + "LibrariesDefinition", "LibList", "Name", "OptName", "ArgVal", + "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader", + "@5", "END", "Function", "FnDeclareLinkage", "FunctionProto", "@6", "@7", + "OptSideEffect", "ConstValueRef", "SymbolicValueRef", "ValueRef", + "ResolvedVal", "BasicBlockList", "BasicBlock", "InstructionList", + "Unwind", "BBTerminatorInst", "JumpTable", "Inst", "PHIList", + "ValueRefList", "ValueRefListE", "OptTailCall", "InstVal", "IndexList", + "OptVolatile", "MemoryInst", 0 }; +#endif -static const short yypact[] = {-32768, - 239, 567,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768, -46,-32768, 55,-32768,-32768, -14,-32768,-32768, 48, - -6, 104, 161, 19,-32768, -34, 155, 249,-32768,-32768, - 98,-32768,-32768,-32768,-32768, 33, 43, 49, 57,-32768, - 59, 155, 1265, 150, 150, 150, 150,-32768,-32768,-32768, --32768,-32768,-32768, 214,-32768,-32768,-32768,-32768,-32768,-32768, - 1265, -19, 1479,-32768, 196, 157, 224, 206, 212,-32768, --32768,-32768,-32768, 87,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768, 241, 247, 4, - 15,-32768,-32768, 108,-32768,-32768, 12,-32768,-32768,-32768, --32768, 1306, 1306, 1306, 1326, 249,-32768, 98,-32768,-32768, --32768,-32768, 1306,-32768, 194, 1367, 116, 177, 249,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768, 355, 429, 1306, 1306, - 1306, 1306, 1306, 1306, 1306, 1306, 1306, 1306, 1306, 1306, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768, 1306, 1306, 1306, 1306, 1306,-32768,-32768, - 249,-32768, 106,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768, -32,-32768, 103, 110, 75,-32768,-32768, 12, -81, - 1046,-32768,-32768,-32768,-32768, 197, 230, 265, 237, 267, - 240, 268, 246, 270, 269, 271, 254, 273, 272, 566, --32768,-32768, 120, 766,-32768,-32768, 87,-32768, 766, 766, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 766, 1265,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768, 1306,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 1306, - 136, 137,-32768, 766, 134, 146, 147, 149, 152, 158, - 174, 176, 179, 766, 766, 766, 180, 262, 1265, 1306, - 1306, 279,-32768, 1306, 1306, 173, -27, 1306,-32768,-32768, - 184, 183, 187, 187, 187,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768, 355, 429, 186, 188, 189, - 190, 191, 1087, 1387, 529, 311, 192, 193, 198, 199, - 202,-32768,-32768, 187, 1107,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768, 286, 1326,-32768,-32768,-32768,-32768, 205, --32768, 207, 766, 766, 766, 7,-32768, 20,-32768, 208, - 766, 209, 1306, 1306, 1306, 1306, 1306, 1306, 1306, 210, - 216, 217, 1306, 1306, 766, 766, 218,-32768, -12, 9, --32768, 204, 12, 1148,-32768, 8,-32768,-32768,-32768, 220, - 221, 1326, 1326, 1326, 1326, 1326,-32768,-32768, -8, 741, - -82,-32768, -9,-32768, 1326, 1326, 1326, 1326, 1326,-32768, --32768, 98,-32768, 219, 203,-32768, 343, -13, 356, 357, - 228, 226, 233, 766, 383, 766, 1306,-32768, 235, 766, - 236,-32768,-32768, 243, 244,-32768,-32768, 766, 766, 766, --32768,-32768, 238,-32768, 1306,-32768,-32768,-32768,-32768, 366, - 394,-32768, 187, 1326, 1326, 208, 250, 251, 252, 258, - 1326,-32768, 256, -25, 11,-32768,-32768, 259, 266, 274, - 278, 363,-32768,-32768, 1205, 387, 280,-32768, 766, 766, - 1306, 766, 766, 281,-32768, 281,-32768, 282, 766, 283, - 1306, 1306, 1306,-32768,-32768,-32768, 1306, 766,-32768,-32768, --32768, 284, 290, 288, 1326, 1326, 1326, 1326,-32768,-32768, - 263, 1326, 1326, 1326, 1326, 1306,-32768,-32768,-32768, 368, - 376, 293, 294, 282, 291,-32768,-32768, 369,-32768,-32768, - 1306, 264, 766,-32768,-32768,-32768, 296,-32768, 1326, 1326, --32768, 300, 299, 305, 306,-32768, 308, 310, 313, 314, - 315, 457,-32768,-32768, 441, 41, 436,-32768,-32768, 325, --32768, 329, 331, 1326,-32768, 1326, 1326,-32768,-32768,-32768, --32768,-32768,-32768, 766,-32768, 893, 145, 468,-32768,-32768, --32768, 334, 335, 336,-32768, 340,-32768, 893, 766,-32768, --32768,-32768, 473, 342, 182, 766, 475, 479,-32768, 766, - 766,-32768,-32768, 502, 503,-32768 +# ifdef YYPRINT +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to + token YYLEX-NUM. */ +static const yytype_uint16 yytoknum[] = +{ + 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, + 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, + 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, + 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, + 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, + 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, + 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, + 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, + 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, + 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, + 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, + 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, + 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, + 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, + 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, + 405, 406, 61, 44, 92, 40, 41, 91, 120, 93, + 60, 62, 123, 125, 42, 99 }; +# endif -static const short yypgoto[] = {-32768, --32768, 443, 444, 446, 195, 200, 447, 451, -117, -114, - -539,-32768, 484, 481, -105,-32768, -265, 40,-32768, -236, --32768, -58,-32768, -43,-32768, -72, -33,-32768, -99, 298, - -250, 58,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 480, --32768,-32768,-32768,-32768, 10,-32768, 46,-32768,-32768, 417, --32768,-32768,-32768,-32768,-32768,-32768, 522,-32768,-32768,-32768, - -526, 144, -88, -111,-32768, 508,-32768, -69,-32768,-32768, --32768,-32768, 100, 31,-32768,-32768, 73,-32768,-32768 +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint8 yyr1[] = +{ + 0, 166, 167, 167, 168, 168, 169, 169, 169, 169, + 169, 169, 169, 169, 169, 169, 169, 170, 170, 170, + 171, 171, 171, 171, 171, 171, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 173, 173, 173, 173, + 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, + 173, 173, 174, 174, 174, 174, 175, 175, 175, 175, + 175, 175, 175, 175, 175, 175, 175, 175, 175, 176, + 176, 176, 176, 177, 177, 177, 177, 178, 178, 179, + 179, 180, 180, 181, 181, 181, 181, 181, 181, 181, + 181, 182, 182, 182, 182, 182, 182, 182, 182, 183, + 183, 184, 184, 185, 186, 186, 187, 187, 188, 188, + 189, 189, 190, 190, 191, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 193, 193, 193, + 193, 193, 193, 193, 193, 193, 193, 193, 193, 194, + 194, 195, 195, 195, 195, 196, 196, 196, 196, 196, + 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, + 196, 196, 196, 197, 197, 197, 197, 197, 197, 197, + 197, 197, 197, 197, 197, 198, 198, 199, 199, 200, + 201, 201, 201, 201, 201, 202, 202, 202, 203, 202, + 204, 202, 205, 202, 206, 202, 202, 202, 202, 207, + 208, 208, 209, 209, 209, 209, 210, 211, 211, 211, + 212, 212, 213, 213, 214, 215, 215, 216, 216, 216, + 216, 217, 218, 218, 220, 219, 221, 221, 222, 223, + 223, 223, 225, 226, 224, 227, 227, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 229, 229, + 230, 230, 231, 232, 232, 233, 234, 234, 234, 235, + 235, 236, 236, 236, 236, 236, 236, 236, 236, 236, + 237, 237, 238, 239, 239, 240, 240, 241, 241, 242, + 242, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 244, + 244, 245, 245, 246, 246, 246, 246, 246, 246, 246, + 246 }; +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = +{ + 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, + 0, 0, 1, 1, 1, 1, 1, 1, 2, 0, + 2, 0, 3, 2, 0, 1, 0, 3, 1, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 2, 4, 5, 5, 3, 2, 5, 4, 2, 1, + 3, 1, 3, 1, 0, 4, 3, 3, 4, 4, + 3, 6, 5, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 6, 5, 8, 6, 6, 6, 7, + 7, 6, 6, 8, 8, 3, 1, 1, 1, 1, + 2, 2, 4, 2, 1, 4, 2, 4, 0, 7, + 0, 7, 0, 7, 0, 7, 3, 4, 0, 1, + 1, 1, 3, 3, 3, 3, 3, 3, 1, 0, + 1, 1, 1, 0, 2, 3, 1, 1, 3, 1, + 0, 8, 1, 1, 0, 4, 1, 1, 2, 0, + 1, 1, 0, 0, 5, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 3, 1, 5, 1, 1, + 1, 1, 2, 2, 2, 3, 2, 0, 1, 1, + 1, 2, 2, 3, 9, 9, 8, 13, 1, 1, + 6, 5, 2, 6, 7, 1, 3, 1, 0, 2, + 1, 5, 5, 5, 6, 6, 2, 4, 4, 6, + 4, 4, 4, 4, 6, 6, 2, 7, 1, 2, + 0, 1, 0, 3, 6, 3, 6, 2, 4, 6, + 4 +}; -#define YYLAST 1630 - - -static const short yytable[] = { 95, - 239, 225, 108, 240, 228, 221, 359, 195, 29, 109, - 49, 24, 50, 242, 27, 32, 576, 95, 199, 72, - 73, 424, 197, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 426, 86, 18, 588, 19, 273, - 24, 450, 277, 278, 279, 280, 281, 282, 283, 586, - 231, 232, 233, 234, 235, 236, 237, 238, 203, 204, - 205, 594, 87, 425, 451, 287, 288, 388, 389, 224, - 461, 298, 224, 401, 403, 289, 425, 29, 466, 72, - 73, 299, 197, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 418, 86, 18, 410, 19, 36, - 37, 38, 103, 104, 105, 271, 272, 224, 274, 275, - 224, 224, 224, 224, 224, 224, 224, 223, 39, 18, - 292, 19, 87, 199, 229, 298, 293, -138, 199, -111, - 284, 285, 286, 224, 224, 382, 230, -138, 202, 461, - 350, 351, 110, 461, 461, 41, 446, 478, 33, 465, - 462, 202, 352, 467, 231, 232, 233, 234, 235, 236, - 237, 238, 297, 461, 42, 196, -111, 301, 88, 447, - 48, 89, 202, 511, 90, 202, 91, 198, 52, 377, - 43, 100, 101, 353, 65, 360, 231, 232, 233, 234, - 235, 236, 237, 238, 66, 370, 371, 372, 95, 575, - 67, 5, 6, 7, 8, 44, 10, 45, 68, 354, - 46, 186, 187, 290, 291, 69, 501, 107, 529, 185, - 530, 379, 380, 306, 307, 383, 355, 189, 88, 190, - 375, 89, -71, -71, 90, 191, 91, 296, -178, -70, - -70, -112, -69, -69, 193, 95, 376, 224, -68, -68, - 194, 431, 226, 433, 434, 435, 308, 309, 121, 122, - 294, 441, 201, 3, 421, 422, 423, 295, -75, 4, - -74, -73, 429, -72, 335, -78, 311, -79, 312, 5, - 6, 7, 8, 9, 10, 11, 443, 444, 356, 358, - 361, 412, 456, 457, 458, 459, 460, 374, 362, 363, - 12, 364, 378, 587, 365, 468, 469, 470, 471, 472, - 366, 383, 54, 55, 56, 57, 58, 59, 60, 224, - 432, 224, 224, 224, 436, 437, 367, 464, 368, 224, - 442, 369, 373, 381, 404, 484, 384, 486, 385, 386, - 392, 490, 393, 394, 395, 396, 405, 406, 416, 494, - 495, 496, 407, 408, 502, 503, 409, 419, 476, 420, - 427, 509, 438, 333, 448, 430, 477, 348, 439, 440, - 445, 475, 348, 348, 454, 455, 479, 480, 482, 534, - 535, 536, 481, 224, 348, 483, 485, 489, 491, 499, - 522, 523, 497, 526, 527, 492, 493, 500, 516, 554, - 532, 498, 505, 506, 507, 542, 543, 544, 545, 538, - 508, 512, 547, 548, 549, 550, 510, 348, 513, 558, - 450, 473, 559, 546, 552, 425, 514, 348, 348, 348, - 515, 412, 521, 528, 531, 533, 539, 224, 239, 562, - 563, 240, 540, 541, 560, 555, 557, 224, 224, 224, - 556, 561, 564, 224, 565, 254, 255, 566, 567, 239, - 573, 574, 240, 568, 582, 569, 583, 584, 570, 571, - 572, 578, 551, 243, 244, 245, 246, 247, 248, 249, - 250, 251, 252, 579, 580, 585, 581, 224, 589, 590, - 591, 592, 593, 596, 597, 600, 348, 348, 348, 601, - 595, 605, 606, 47, 348, 174, 175, 599, 176, 177, - 390, 602, 603, 178, 63, 519, 391, 332, 348, 348, - 518, 71, 222, 25, 35, 598, 488, 537, 504, 0, - 0, 0, 0, 72, 73, 0, 197, 206, 207, 208, - 209, 210, 211, 212, 213, 214, 215, 216, 0, 86, - 18, 0, 19, 256, 257, 258, 259, 260, 261, 262, - 263, 264, 265, 266, 267, 268, 269, 348, 0, 348, - 72, 73, 0, 348, 0, 0, 87, 0, 0, 0, - 0, 348, 348, 348, 0, 0, -81, 18, 18, 19, - 19, 313, 0, 0, 0, 0, 0, 4, -81, -81, - 0, 0, 0, 314, 315, 0, 0, -81, -81, -81, - -81, -81, -81, -81, 0, 0, -81, 20, 0, 0, - 0, 0, 348, 348, 21, 348, 348, 0, 22, 0, - 0, 0, 348, 0, 0, 0, 0, 0, 0, 0, - 0, 348, 0, 0, 123, 124, 125, 126, 127, 128, - 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, - 139, 140, 141, 142, 143, 144, 145, 146, 316, 317, - 0, 0, 0, 0, 0, 318, 348, 319, 0, 320, - 321, 322, 88, 0, 0, 89, 0, 0, 90, 0, - 91, 402, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 171, 172, 173, 348, 0, 0, - 0, 0, 323, 0, 0, 324, 0, 325, 0, 0, - 326, 0, 348, 0, 0, 0, 0, 0, 0, 348, - 0, 0, 0, 348, 348, 72, 73, 0, 197, 206, - 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, - 0, 86, 18, 0, 19, 0, 0, 0, 336, 337, - 72, 73, 338, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 18, 87, 19, - 0, 339, 340, 341, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 342, 343, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 344, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 123, 124, 125, 126, 127, 128, - 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, - 139, 140, 141, 142, 143, 144, 145, 146, 316, 317, - 0, 0, 0, 0, 0, 318, 0, 319, 0, 320, - 321, 322, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 88, 336, 337, 89, 0, 338, - 90, 0, 91, 463, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 171, 172, 173, 0, 339, 340, - 341, 0, 0, 0, 0, 345, 0, 0, 0, 0, - 342, 343, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 344, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 123, 124, 125, 126, 127, 128, 129, 130, 131, - 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, - 142, 143, 144, 145, 146, 316, 317, 0, 0, 0, - 0, 0, 318, 0, 319, 0, 320, 321, 322, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 161, 162, 163, 164, 165, 166, 167, 168, 169, - 170, 171, 172, 173, 0, 0, 0, 0, 0, 0, - 72, 73, 345, 197, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 0, 86, 18, 0, 19, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 300, 0, 0, 0, 0, 0, 0, 0, - 0, 72, 73, 87, 197, 206, 207, 208, 209, 210, - 211, 212, 213, 214, 215, 216, 0, 86, 18, 0, - 19, 72, 73, 0, 197, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 0, 86, 18, 0, - 19, 0, 0, 0, 87, 0, 0, 0, 0, 0, - 0, 0, 0, 411, 0, 0, 0, 0, 0, 0, - 0, 0, 72, 73, 87, 197, 75, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 85, 0, 86, 18, - 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 449, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 87, 0, 0, 0, 88, - 0, 0, 89, 0, 0, 90, 0, 91, 0, 72, - 73, 0, 197, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 0, 86, 18, 0, 19, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 88, 517, 0, 89, 0, 397, 90, 0, 91, 0, - 0, 0, 87, 0, 0, 0, 0, 0, 0, 0, - 88, 0, 0, 89, 0, 0, 90, 0, 91, 72, - 73, 0, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 0, 86, 18, 0, 19, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 88, 0, 0, 89, 0, 0, 90, 0, 91, - 72, 73, 87, 197, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 0, 86, 18, 0, 19, - 72, 73, 0, 197, 206, 207, 208, 209, 210, 211, - 212, 213, 214, 215, 216, 0, 86, 18, 0, 19, - 0, 0, 0, 87, 0, 0, 0, 0, 88, 0, - 0, 89, 0, 0, 90, 0, 91, 0, 0, 0, - 0, 72, 73, 87, 227, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 0, 86, 18, 0, - 19, 72, 73, 0, 197, 206, 207, 208, 209, 210, - 211, 212, 213, 214, 215, 216, 0, 86, 18, 0, - 19, 0, 0, 0, 87, 0, 0, 0, 88, 0, - 0, 89, 0, 0, 90, 0, 91, 0, 0, 0, - 0, 0, 0, 0, 87, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, - 0, 0, 89, 0, 0, 90, 0, 91, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, - 0, 0, 89, 0, 0, 90, 0, 91, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, - 88, 0, 0, 89, 0, 0, 90, 113, 91, 0, - 0, 0, 0, 0, 0, 0, 0, 114, 115, 0, - 88, 0, 0, 89, 0, 0, 90, 0, 400, 0, - 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, - 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, - 146, 147, 148, 149, 150, 151, 0, 0, 152, 153, - 154, 155, 156, 157, 158, 159, 160, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 161, 162, 163, - 164, 165, 166, 167, 168, 169, 170, 171, 172, 173 +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state + STATE-NUM when YYTABLE doesn't specify something else to do. Zero + means the default is an error. */ +static const yytype_uint16 yydefact[] = +{ + 198, 0, 90, 184, 1, 183, 232, 83, 84, 85, + 86, 87, 88, 89, 0, 224, 257, 180, 181, 257, + 210, 211, 0, 0, 0, 90, 0, 186, 229, 0, + 91, 258, 254, 82, 226, 227, 228, 253, 0, 0, + 0, 0, 196, 0, 0, 0, 0, 0, 0, 0, + 81, 230, 231, 233, 199, 182, 0, 92, 93, 94, + 95, 96, 97, 0, 0, 302, 256, 0, 0, 0, + 0, 209, 197, 187, 2, 3, 111, 115, 116, 117, + 118, 119, 120, 121, 122, 123, 124, 125, 126, 128, + 0, 0, 0, 0, 248, 185, 0, 110, 127, 114, + 249, 129, 177, 178, 0, 0, 0, 0, 91, 98, + 0, 222, 223, 225, 301, 0, 280, 0, 0, 0, + 0, 91, 269, 259, 260, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 52, + 53, 54, 55, 20, 21, 22, 23, 24, 25, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 68, 56, 57, 58, 59, 60, 61, + 62, 63, 64, 65, 66, 67, 0, 0, 0, 0, + 0, 268, 255, 91, 272, 0, 298, 204, 201, 200, + 202, 203, 205, 208, 0, 130, 0, 0, 0, 113, + 135, 139, 0, 144, 138, 192, 194, 190, 115, 116, + 117, 118, 119, 120, 121, 122, 123, 124, 125, 0, + 0, 0, 0, 188, 234, 0, 0, 286, 279, 262, + 261, 0, 0, 72, 76, 71, 75, 70, 74, 69, + 73, 77, 78, 0, 0, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 0, 50, 51, 46, 47, + 48, 49, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 0, 101, 101, 307, 0, 0, 296, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 206, 0, 0, 0, 0, + 0, 134, 143, 141, 0, 106, 106, 106, 160, 161, + 4, 5, 158, 159, 162, 157, 153, 154, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 156, 155, 106, 220, 237, 238, + 239, 244, 240, 241, 242, 243, 235, 0, 246, 251, + 250, 252, 0, 263, 0, 0, 0, 0, 0, 303, + 0, 305, 300, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 207, 112, 112, 137, 0, 140, 0, 131, 0, 193, + 195, 191, 0, 0, 0, 0, 0, 0, 0, 146, + 176, 0, 0, 0, 150, 0, 147, 0, 0, 0, + 0, 0, 189, 219, 213, 216, 217, 0, 236, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 310, 0, 0, 0, 290, 293, 0, 0, 291, 292, + 0, 0, 0, 287, 288, 0, 308, 0, 132, 133, + 136, 142, 0, 0, 108, 106, 0, 0, 300, 0, + 0, 0, 0, 0, 145, 135, 114, 0, 148, 149, + 0, 0, 0, 0, 0, 212, 214, 0, 104, 0, + 245, 0, 0, 278, 0, 0, 101, 102, 101, 275, + 299, 0, 0, 0, 0, 0, 281, 282, 283, 278, + 0, 103, 109, 107, 0, 0, 0, 0, 0, 0, + 0, 175, 152, 0, 0, 0, 0, 0, 0, 218, + 215, 105, 99, 0, 0, 0, 277, 0, 284, 285, + 0, 304, 306, 0, 0, 0, 289, 294, 295, 0, + 309, 0, 0, 164, 0, 0, 0, 0, 151, 0, + 0, 0, 0, 0, 0, 221, 247, 0, 0, 0, + 276, 273, 0, 297, 0, 0, 0, 172, 0, 0, + 166, 167, 168, 171, 163, 100, 0, 266, 0, 0, + 0, 274, 169, 170, 0, 0, 0, 264, 0, 265, + 0, 0, 165, 173, 174, 0, 0, 0, 0, 0, + 0, 271, 0, 0, 270, 267 }; -static const short yycheck[] = { 43, - 118, 113, 61, 118, 116, 105, 272, 4, 23, 29, - 45, 2, 47, 119, 61, 30, 556, 61, 91, 5, - 6, 15, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 15, 21, 22, 577, 24, 151, - 31, 34, 154, 155, 156, 157, 158, 159, 160, 576, - 10, 11, 12, 13, 14, 15, 16, 17, 102, 103, - 104, 588, 48, 57, 57, 177, 178, 304, 305, 113, - 153, 153, 116, 324, 325, 181, 57, 23, 161, 5, - 6, 163, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 345, 21, 22, 334, 24, 52, - 53, 54, 45, 46, 47, 149, 150, 151, 152, 153, - 154, 155, 156, 157, 158, 159, 160, 108, 71, 22, - 153, 24, 48, 196, 9, 153, 159, 153, 201, 155, - 174, 175, 176, 177, 178, 163, 21, 163, 164, 153, - 229, 230, 162, 153, 153, 152, 159, 161, 163, 400, - 159, 164, 241, 163, 10, 11, 12, 13, 14, 15, - 16, 17, 196, 153, 61, 162, 155, 201, 154, 161, - 152, 157, 164, 163, 160, 164, 162, 163, 24, 291, - 20, 32, 33, 242, 152, 274, 10, 11, 12, 13, - 14, 15, 16, 17, 152, 284, 285, 286, 242, 159, - 152, 41, 42, 43, 44, 45, 46, 47, 152, 253, - 50, 55, 56, 108, 109, 157, 453, 4, 484, 24, - 486, 294, 295, 27, 28, 298, 270, 4, 154, 24, - 289, 157, 3, 4, 160, 24, 162, 163, 0, 3, - 4, 155, 3, 4, 4, 289, 290, 291, 3, 4, - 4, 363, 59, 365, 366, 367, 3, 4, 77, 78, - 158, 373, 155, 25, 353, 354, 355, 158, 4, 31, - 4, 4, 361, 4, 155, 7, 4, 7, 7, 41, - 42, 43, 44, 45, 46, 47, 375, 376, 153, 153, - 157, 335, 392, 393, 394, 395, 396, 36, 153, 153, - 62, 153, 24, 159, 153, 405, 406, 407, 408, 409, - 153, 384, 64, 65, 66, 67, 68, 69, 70, 363, - 364, 365, 366, 367, 368, 369, 153, 400, 153, 373, - 374, 153, 153, 161, 24, 424, 153, 426, 156, 153, - 155, 430, 155, 155, 155, 155, 155, 155, 63, 438, - 439, 440, 155, 155, 454, 455, 155, 153, 156, 153, - 153, 461, 153, 220, 161, 157, 24, 224, 153, 153, - 153, 153, 229, 230, 155, 155, 21, 21, 153, 491, - 492, 493, 155, 427, 241, 153, 4, 153, 153, 24, - 479, 480, 155, 482, 483, 153, 153, 4, 36, 24, - 489, 445, 153, 153, 153, 505, 506, 507, 508, 498, - 153, 153, 512, 513, 514, 515, 161, 274, 153, 531, - 34, 412, 159, 161, 57, 57, 153, 284, 285, 286, - 153, 475, 153, 153, 153, 153, 153, 481, 556, 539, - 540, 556, 153, 156, 533, 153, 156, 491, 492, 493, - 157, 156, 153, 497, 156, 27, 28, 153, 153, 577, - 4, 21, 577, 156, 564, 156, 566, 567, 156, 156, - 156, 36, 516, 119, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 159, 156, 574, 156, 531, 21, 156, - 156, 156, 153, 21, 153, 21, 353, 354, 355, 21, - 589, 0, 0, 23, 361, 63, 63, 596, 63, 63, - 316, 600, 601, 63, 31, 476, 317, 220, 375, 376, - 475, 42, 106, 2, 17, 595, 427, 497, 456, -1, - -1, -1, -1, 5, 6, -1, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 19, -1, 21, - 22, -1, 24, 125, 126, 127, 128, 129, 130, 131, - 132, 133, 134, 135, 136, 137, 138, 424, -1, 426, - 5, 6, -1, 430, -1, -1, 48, -1, -1, -1, - -1, 438, 439, 440, -1, -1, 20, 22, 22, 24, - 24, 26, -1, -1, -1, -1, -1, 31, 32, 33, - -1, -1, -1, 38, 39, -1, -1, 41, 42, 43, - 44, 45, 46, 47, -1, -1, 50, 51, -1, -1, - -1, -1, 479, 480, 58, 482, 483, -1, 62, -1, - -1, -1, 489, -1, -1, -1, -1, -1, -1, -1, - -1, 498, -1, -1, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, - -1, -1, -1, -1, -1, 110, 533, 112, -1, 114, - 115, 116, 154, -1, -1, 157, -1, -1, 160, -1, - 162, 163, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 139, 140, 141, 142, 143, 144, - 145, 146, 147, 148, 149, 150, 151, 574, -1, -1, - -1, -1, 157, -1, -1, 160, -1, 162, -1, -1, - 165, -1, 589, -1, -1, -1, -1, -1, -1, 596, - -1, -1, -1, 600, 601, 5, 6, -1, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - -1, 21, 22, -1, 24, -1, -1, -1, 3, 4, - 5, 6, 7, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 22, 48, 24, - -1, 26, 27, 28, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 38, 39, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 61, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, - -1, -1, -1, -1, -1, 110, -1, 112, -1, 114, - 115, 116, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 154, 3, 4, 157, -1, 7, - 160, -1, 162, 163, 139, 140, 141, 142, 143, 144, - 145, 146, 147, 148, 149, 150, 151, -1, 26, 27, - 28, -1, -1, -1, -1, 160, -1, -1, -1, -1, - 38, 39, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 61, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 79, 80, 81, 82, 83, 84, 85, 86, 87, - 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, 104, -1, -1, -1, - -1, -1, 110, -1, 112, -1, 114, 115, 116, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 151, -1, -1, -1, -1, -1, -1, - 5, 6, 160, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, -1, 21, 22, -1, 24, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 37, -1, -1, -1, -1, -1, -1, -1, - -1, 5, 6, 48, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, -1, 21, 22, -1, - 24, 5, 6, -1, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, -1, 21, 22, -1, - 24, -1, -1, -1, 48, -1, -1, -1, -1, -1, - -1, -1, -1, 37, -1, -1, -1, -1, -1, -1, - -1, -1, 5, 6, 48, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, -1, 21, 22, - -1, 24, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 37, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 48, -1, -1, -1, 154, - -1, -1, 157, -1, -1, 160, -1, 162, -1, 5, - 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, -1, 21, 22, -1, 24, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 154, 37, -1, 157, -1, 159, 160, -1, 162, -1, - -1, -1, 48, -1, -1, -1, -1, -1, -1, -1, - 154, -1, -1, 157, -1, -1, 160, -1, 162, 5, - 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, -1, 21, 22, -1, 24, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 154, -1, -1, 157, -1, -1, 160, -1, 162, - 5, 6, 48, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, -1, 21, 22, -1, 24, - 5, 6, -1, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, -1, 21, 22, -1, 24, - -1, -1, -1, 48, -1, -1, -1, -1, 154, -1, - -1, 157, -1, -1, 160, -1, 162, -1, -1, -1, - -1, 5, 6, 48, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, -1, 21, 22, -1, - 24, 5, 6, -1, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, -1, 21, 22, -1, - 24, -1, -1, -1, 48, -1, -1, -1, 154, -1, - -1, 157, -1, -1, 160, -1, 162, -1, -1, -1, - -1, -1, -1, -1, 48, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 154, - -1, -1, 157, -1, -1, 160, -1, 162, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 154, - -1, -1, 157, -1, -1, 160, -1, 162, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 35, -1, -1, -1, -1, -1, -1, - 154, -1, -1, 157, -1, -1, 160, 49, 162, -1, - -1, -1, -1, -1, -1, -1, -1, 59, 60, -1, - 154, -1, -1, 157, -1, -1, 160, -1, 162, -1, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, - 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, - 102, 103, 104, 105, 106, 107, -1, -1, 110, 111, - 112, 113, 114, 115, 116, 117, 118, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 139, 140, 141, - 142, 143, 144, 145, 146, 147, 148, 149, 150, 151 +/* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int16 yydefgoto[] = +{ + -1, 94, 312, 329, 330, 331, 255, 272, 332, 333, + 219, 220, 243, 221, 25, 15, 63, 555, 359, 454, + 522, 389, 455, 95, 96, 222, 98, 99, 202, 304, + 400, 348, 401, 104, 1, 2, 3, 336, 307, 305, + 306, 55, 190, 42, 72, 194, 100, 476, 415, 416, + 417, 64, 113, 16, 30, 36, 17, 53, 18, 28, + 108, 419, 349, 101, 351, 489, 19, 32, 33, 181, + 182, 579, 66, 278, 526, 527, 183, 184, 430, 185, + 186 }; -/* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/share/bison.simple" -/* This file comes from bison-1.28. */ -/* Skeleton output parser for bison, - Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +#define YYPACT_NINF -542 +static const yytype_int16 yypact[] = +{ + -542, 13, 162, 567, -542, -542, -542, -542, -542, -542, + -542, -542, -542, -542, 83, -542, 19, -542, -542, -14, + -542, -542, 50, -87, 87, 233, 27, -542, 123, 141, + 175, -542, -542, 98, -542, -542, -542, -542, 33, 40, + 66, 68, -542, 14, 141, 1265, 156, 156, 156, 156, + -542, -542, -542, -542, -542, -542, 221, -542, -542, -542, + -542, -542, -542, 1265, -19, 1479, -542, 204, 135, 226, + 227, 235, -542, -542, -542, -542, 81, -542, -542, -542, + -542, -542, -542, -542, -542, -542, -542, -542, -542, -542, + 256, 257, 4, 15, -542, -542, 108, -542, -542, 12, + -542, -542, -542, -542, 1306, 1306, 1306, 1326, 175, -542, + 98, -542, -542, -542, -542, 1306, -542, 205, 1367, 116, + 479, 175, -542, -542, -542, -542, -542, -542, -542, -542, + -542, -542, -542, -542, -542, -542, -542, -542, -542, -542, + -542, -542, -542, -542, -542, -542, -542, -542, -542, 355, + 429, 1306, 1306, 1306, 1306, 1306, 1306, 1306, 1306, 1306, + 1306, 1306, 1306, -542, -542, -542, -542, -542, -542, -542, + -542, -542, -542, -542, -542, -542, 1306, 1306, 1306, 1306, + 1306, -542, -542, 175, -542, 86, -542, -542, -542, -542, + -542, -542, -542, -542, -13, -542, 110, 111, 75, -542, + -542, 12, -81, 1046, -542, -542, -542, -542, 174, 208, + 266, 210, 267, 212, 268, 230, 277, 275, 278, 246, + 280, 279, 566, -542, -542, 136, 766, -542, -542, 81, + -542, 766, 766, -542, -542, -542, -542, -542, -542, -542, + -542, -542, -542, 766, 1265, -542, -542, -542, -542, -542, + -542, -542, -542, -542, -542, 1306, -542, -542, -542, -542, + -542, -542, -542, -542, -542, -542, -542, -542, -542, -542, + -542, -542, 1306, 137, 145, -542, 766, 132, 146, 147, + 148, 149, 151, 152, 158, 160, 766, 766, 766, 161, + 281, 1265, 1306, 1306, 291, -542, 1306, 1306, 155, -27, + 1306, -542, -542, 165, 163, 176, 176, 176, -542, -542, + -542, -542, -542, -542, -542, -542, -542, -542, 355, 429, + 172, 177, 178, 179, 182, 1087, 1387, 529, 311, 184, + 185, 186, 188, 189, -542, -542, 176, 1107, -542, -542, + -542, -542, -542, -542, -542, -542, 282, 1326, -542, -542, + -542, -542, 193, -542, 194, 766, 766, 766, 7, -542, + 20, -542, 195, 766, 192, 1306, 1306, 1306, 1306, 1306, + 1306, 1306, 200, 201, 206, 1306, 1306, 766, 766, 207, + -542, -59, -149, -542, 196, 12, 1148, -542, 44, -542, + -542, -542, 203, 211, 1326, 1326, 1326, 1326, 1326, -542, + -542, -8, 741, -82, -542, 10, -542, 1326, 1326, 1326, + 1326, 1326, -542, -542, 98, -542, 214, 209, -542, 337, + -34, 342, 348, 215, 218, 219, 766, 371, 766, 1306, + -542, 223, 766, 224, -542, -542, 225, 234, -542, -542, + 766, 766, 766, -542, -542, 228, -542, 1306, -542, -542, + -542, -542, 362, 375, -542, 176, 1326, 1326, 195, 236, + 237, 240, 243, 1326, -542, 238, -25, 11, -542, -542, + 244, 245, 247, 250, 352, -542, -542, 1205, 370, 252, + -542, 766, 766, 1306, 766, 766, 258, -542, 258, -542, + 259, 766, 264, 1306, 1306, 1306, -542, -542, -542, 1306, + 766, -542, -542, -542, 270, 271, 263, 1326, 1326, 1326, + 1326, -542, -542, 260, 1326, 1326, 1326, 1326, 1306, -542, + -542, -542, 368, 402, 274, 276, 259, 287, -542, -542, + 374, -542, -542, 1306, 285, 766, -542, -542, -542, 290, + -542, 1326, 1326, -542, 283, 295, 284, 294, -542, 296, + 297, 299, 302, 303, 430, -542, -542, 414, 41, 425, + -542, -542, 305, -542, 306, 310, 1326, -542, 1326, 1326, + -542, -542, -542, -542, -542, -542, 766, -542, 893, 144, + 448, -542, -542, -542, 314, 315, 316, -542, 331, -542, + 893, 766, -542, -542, -542, 464, 334, 180, 766, 481, + 482, -542, 766, 766, -542, -542 +}; - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. +/* YYPGOTO[NTERM-NUM]. */ +static const yytype_int16 yypgoto[] = +{ + -542, -542, -542, 435, 439, 441, 191, 197, 442, 445, + -119, -116, -541, -542, 478, 489, -107, -542, -267, 37, + -542, -238, -542, -60, -542, -45, -542, -74, -51, -542, + -101, 300, -252, 134, -542, -542, -542, -542, -542, -542, + -542, 473, -542, -542, -542, -542, 8, -542, 46, -542, + -542, 410, -542, -542, -542, -542, -542, -542, 518, -542, + -542, -542, -528, 142, -90, -113, -542, 505, -542, -72, + -542, -542, -542, -542, 97, 28, -542, -542, 70, -542, + -542 +}; - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule which + number is the opposite. If zero, do what YYDEFACT says. + If YYTABLE_NINF, syntax error. */ +#define YYTABLE_NINF -180 +static const yytype_int16 yytable[] = +{ + 97, 241, 227, 110, 242, 230, 223, 361, 197, 31, + 111, 26, 449, 4, 244, 204, 34, 578, 97, 201, + 74, 75, 426, 199, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 428, 88, 20, 590, 21, + 275, 26, 31, 279, 280, 281, 282, 283, 284, 285, + 588, 233, 234, 235, 236, 237, 238, 239, 240, 205, + 206, 207, 596, 89, 427, 43, 289, 290, 390, 391, + 226, 463, 300, 226, 403, 405, 291, 427, 452, 468, + 74, 75, 301, 199, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 420, 88, 20, 412, 21, + 448, 453, 38, 39, 40, 204, 273, 274, 226, 276, + 277, 226, 226, 226, 226, 226, 226, 226, 225, 463, + 20, 41, 21, 89, 201, 231, 300, 480, -139, 201, + -112, 286, 287, 288, 226, 226, 384, 232, -139, 204, + 294, 352, 353, 112, 29, 463, 295, 299, 44, 35, + 467, 464, 303, 354, 233, 234, 235, 236, 237, 238, + 239, 240, -179, 463, 463, 54, 198, -112, 51, 90, + 52, 71, 91, 469, 513, 92, 204, 93, 200, 50, + 379, 105, 106, 107, 355, 67, 362, 5, 102, 103, + 188, 189, 68, 6, 292, 293, 372, 373, 374, 97, + 577, 308, 309, 7, 8, 9, 10, 11, 12, 13, + 356, -72, -72, -71, -71, -70, -70, 503, 69, 531, + 70, 532, 381, 382, 14, 109, 385, 357, 187, 90, + 191, 377, 91, -69, -69, 92, -113, 93, 298, 56, + 57, 58, 59, 60, 61, 62, 97, 378, 226, 310, + 311, 192, 433, 45, 435, 436, 437, 123, 124, 193, + 195, 196, 443, 203, 228, 423, 424, 425, 296, 297, + -76, -75, -74, 431, 7, 8, 9, 10, 46, 12, + 47, -73, -79, 48, 313, -80, 314, 445, 446, 363, + 358, 337, 414, 458, 459, 460, 461, 462, 360, 364, + 365, 366, 367, 589, 368, 369, 470, 471, 472, 473, + 474, 370, 385, 371, 375, 380, 383, 376, 386, 387, + 226, 434, 226, 226, 226, 438, 439, 394, 466, 388, + 226, 444, 395, 396, 397, 406, 486, 398, 488, 407, + 408, 409, 492, 410, 411, 418, 421, 422, 429, 432, + 496, 497, 498, 440, 441, 504, 505, 450, 456, 442, + 447, 479, 511, 481, 335, 478, 457, 477, 350, 482, + 483, 484, 485, 350, 350, 487, 491, 493, 494, 502, + 536, 537, 538, 499, 226, 350, 501, 495, 518, 507, + 508, 524, 525, 509, 528, 529, 510, 514, 515, 512, + 516, 534, 500, 517, 452, 523, 544, 545, 546, 547, + 540, 530, 533, 549, 550, 551, 552, 535, 350, 543, + 560, 548, 475, 541, 542, 554, 556, 557, 350, 350, + 350, 427, 414, 558, 575, 576, 566, 568, 226, 241, + 564, 565, 242, 559, 561, 562, 563, 569, 226, 226, + 226, 567, 570, 571, 226, 572, 256, 257, 573, 574, + 241, 580, 582, 242, 581, 584, 583, 585, 586, 591, + 592, 593, 594, 553, 245, 246, 247, 248, 249, 250, + 251, 252, 253, 254, 595, 598, 587, 599, 226, 233, + 234, 235, 236, 237, 238, 239, 240, 350, 350, 350, + 176, 597, 602, 603, 177, 350, 178, 179, 601, 392, + 180, 65, 604, 605, 49, 521, 393, 73, 224, 350, + 350, 27, 334, 520, 37, 600, 490, 539, 506, 0, + 0, 0, 0, 0, 74, 75, 0, 199, 208, 209, + 210, 211, 212, 213, 214, 215, 216, 217, 218, 0, + 88, 20, 0, 21, 258, 259, 260, 261, 262, 263, + 264, 265, 266, 267, 268, 269, 270, 271, 350, 0, + 350, 74, 75, 0, 350, 0, 0, 89, 0, 0, + 0, 0, 350, 350, 350, 0, 0, -82, 20, 20, + 21, 21, 315, 0, 0, 0, 0, 0, 6, -82, + -82, 0, 0, 0, 316, 317, 0, 0, -82, -82, + -82, -82, -82, -82, -82, 0, 0, -82, 22, 0, + 0, 0, 0, 350, 350, 23, 350, 350, 0, 24, + 0, 0, 0, 350, 0, 0, 0, 0, 0, 0, + 0, 0, 350, 0, 0, 125, 126, 127, 128, 129, + 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, + 140, 141, 142, 143, 144, 145, 146, 147, 148, 318, + 319, 0, 0, 0, 0, 0, 320, 350, 321, 0, + 322, 323, 324, 90, 0, 0, 91, 0, 0, 92, + 0, 93, 404, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 163, 164, 165, 166, 167, + 168, 169, 170, 171, 172, 173, 174, 175, 350, 0, + 0, 0, 0, 325, 0, 0, 326, 0, 327, 0, + 0, 328, 0, 350, 0, 0, 0, 0, 0, 0, + 350, 0, 0, 0, 350, 350, 74, 75, 0, 199, + 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, + 218, 0, 88, 20, 0, 21, 0, 0, 0, 338, + 339, 74, 75, 340, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 20, 89, + 21, 0, 341, 342, 343, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 344, 345, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 346, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 125, 126, 127, 128, 129, + 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, + 140, 141, 142, 143, 144, 145, 146, 147, 148, 318, + 319, 0, 0, 0, 0, 0, 320, 0, 321, 0, + 322, 323, 324, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 90, 338, 339, 91, 0, + 340, 92, 0, 93, 465, 163, 164, 165, 166, 167, + 168, 169, 170, 171, 172, 173, 174, 175, 0, 341, + 342, 343, 0, 0, 0, 0, 347, 0, 0, 0, + 0, 344, 345, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 346, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 125, 126, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, + 143, 144, 145, 146, 147, 148, 318, 319, 0, 0, + 0, 0, 0, 320, 0, 321, 0, 322, 323, 324, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 163, 164, 165, 166, 167, 168, 169, 170, + 171, 172, 173, 174, 175, 0, 0, 0, 0, 0, + 0, 74, 75, 347, 199, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 0, 88, 20, 0, + 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 302, 0, 0, 0, 0, 0, 0, + 0, 0, 74, 75, 89, 199, 208, 209, 210, 211, + 212, 213, 214, 215, 216, 217, 218, 0, 88, 20, + 0, 21, 74, 75, 0, 199, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 0, 88, 20, + 0, 21, 0, 0, 0, 89, 0, 0, 0, 0, + 0, 0, 0, 0, 413, 0, 0, 0, 0, 0, + 0, 0, 0, 74, 75, 89, 199, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 0, 88, + 20, 0, 21, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 451, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 89, 0, 0, 0, + 90, 0, 0, 91, 0, 0, 92, 0, 93, 0, + 74, 75, 0, 199, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 0, 88, 20, 0, 21, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 90, 519, 0, 91, 0, 399, 92, 0, 93, + 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, + 0, 90, 0, 0, 91, 0, 0, 92, 0, 93, + 74, 75, 0, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 0, 88, 20, 0, 21, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 90, 0, 0, 91, 0, 0, 92, 0, + 93, 74, 75, 89, 199, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 0, 88, 20, 0, + 21, 74, 75, 0, 199, 208, 209, 210, 211, 212, + 213, 214, 215, 216, 217, 218, 0, 88, 20, 0, + 21, 0, 0, 0, 89, 0, 0, 0, 0, 90, + 0, 0, 91, 0, 0, 92, 0, 93, 0, 0, + 0, 0, 74, 75, 89, 229, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 0, 88, 20, + 0, 21, 74, 75, 0, 199, 208, 209, 210, 211, + 212, 213, 214, 215, 216, 217, 218, 0, 88, 20, + 0, 21, 0, 0, 0, 89, 0, 0, 0, 90, + 0, 0, 91, 0, 0, 92, 0, 93, 0, 0, + 0, 0, 0, 0, 0, 89, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 90, 0, 0, 91, 0, 0, 92, 0, 93, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 90, 0, 0, 91, 0, 0, 92, 0, 93, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 114, 0, 0, 0, 0, 0, + 0, 90, 0, 0, 91, 0, 0, 92, 115, 93, + 0, 0, 0, 0, 0, 0, 0, 0, 116, 117, + 0, 90, 0, 0, 91, 0, 0, 92, 0, 402, + 0, 118, 119, 120, 121, 122, 123, 124, 125, 126, + 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, + 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, + 147, 148, 149, 150, 151, 152, 153, 0, 0, 154, + 155, 156, 157, 158, 159, 160, 161, 162, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 163, 164, + 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, + 175 +}; - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -/* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. - This special exception was added by the Free Software Foundation - in version 1.24 of Bison. */ - -/* This is the parser code that is written into each bison parser - when the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the hairy parser - used when %semantic_parser is specified. */ - -#ifndef YYSTACK_USE_ALLOCA -#ifdef alloca -#define YYSTACK_USE_ALLOCA -#else /* alloca not defined */ -#ifdef __GNUC__ -#define YYSTACK_USE_ALLOCA -#define alloca __builtin_alloca -#else /* not GNU C. */ -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386)) -#define YYSTACK_USE_ALLOCA -#include -#else /* not sparc */ -/* We think this test detects Watcom and Microsoft C. */ -/* This used to test MSDOS, but that is a bad idea - since that symbol is in the user namespace. */ -#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__) -#if 0 /* No need for malloc.h, which pollutes the namespace; - instead, just don't use alloca. */ -#include -#endif -#else /* not MSDOS, or __TURBOC__ */ -#if defined(_AIX) -/* I don't know what this was needed for, but it pollutes the namespace. - So I turned it off. rms, 2 May 1997. */ -/* #include */ - #pragma alloca -#define YYSTACK_USE_ALLOCA -#else /* not MSDOS, or __TURBOC__, or _AIX */ -#if 0 -#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, - and on HPUX 10. Eventually we can turn this on. */ -#define YYSTACK_USE_ALLOCA -#define alloca __builtin_alloca -#endif /* __hpux */ -#endif -#endif /* not _AIX */ -#endif /* not MSDOS, or __TURBOC__ */ -#endif /* not sparc */ -#endif /* not GNU C */ -#endif /* alloca not defined */ -#endif /* YYSTACK_USE_ALLOCA not defined */ - -#ifdef YYSTACK_USE_ALLOCA -#define YYSTACK_ALLOC alloca -#else -#define YYSTACK_ALLOC malloc -#endif +static const yytype_int16 yycheck[] = +{ + 45, 120, 115, 63, 120, 118, 107, 274, 4, 23, + 29, 3, 161, 0, 121, 164, 30, 558, 63, 93, + 5, 6, 15, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 15, 21, 22, 579, 24, + 153, 33, 23, 156, 157, 158, 159, 160, 161, 162, + 578, 10, 11, 12, 13, 14, 15, 16, 17, 104, + 105, 106, 590, 48, 57, 152, 179, 180, 306, 307, + 115, 153, 153, 118, 326, 327, 183, 57, 34, 161, + 5, 6, 163, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 347, 21, 22, 336, 24, + 159, 57, 52, 53, 54, 164, 151, 152, 153, 154, + 155, 156, 157, 158, 159, 160, 161, 162, 110, 153, + 22, 71, 24, 48, 198, 9, 153, 161, 153, 203, + 155, 176, 177, 178, 179, 180, 163, 21, 163, 164, + 153, 231, 232, 162, 61, 153, 159, 198, 61, 163, + 402, 159, 203, 243, 10, 11, 12, 13, 14, 15, + 16, 17, 0, 153, 153, 24, 162, 155, 45, 154, + 47, 157, 157, 163, 163, 160, 164, 162, 163, 152, + 293, 47, 48, 49, 244, 152, 276, 25, 32, 33, + 55, 56, 152, 31, 108, 109, 286, 287, 288, 244, + 159, 27, 28, 41, 42, 43, 44, 45, 46, 47, + 255, 3, 4, 3, 4, 3, 4, 455, 152, 486, + 152, 488, 296, 297, 62, 4, 300, 272, 24, 154, + 4, 291, 157, 3, 4, 160, 155, 162, 163, 64, + 65, 66, 67, 68, 69, 70, 291, 292, 293, 3, + 4, 24, 365, 20, 367, 368, 369, 77, 78, 24, + 4, 4, 375, 155, 59, 355, 356, 357, 158, 158, + 4, 4, 4, 363, 41, 42, 43, 44, 45, 46, + 47, 4, 7, 50, 4, 7, 7, 377, 378, 157, + 153, 155, 337, 394, 395, 396, 397, 398, 153, 153, + 153, 153, 153, 159, 153, 153, 407, 408, 409, 410, + 411, 153, 386, 153, 153, 24, 161, 36, 153, 156, + 365, 366, 367, 368, 369, 370, 371, 155, 402, 153, + 375, 376, 155, 155, 155, 24, 426, 155, 428, 155, + 155, 155, 432, 155, 155, 63, 153, 153, 153, 157, + 440, 441, 442, 153, 153, 456, 457, 161, 155, 153, + 153, 24, 463, 21, 222, 156, 155, 153, 226, 21, + 155, 153, 153, 231, 232, 4, 153, 153, 153, 4, + 493, 494, 495, 155, 429, 243, 24, 153, 36, 153, + 153, 481, 482, 153, 484, 485, 153, 153, 153, 161, + 153, 491, 447, 153, 34, 153, 507, 508, 509, 510, + 500, 153, 153, 514, 515, 516, 517, 153, 276, 156, + 533, 161, 414, 153, 153, 57, 24, 153, 286, 287, + 288, 57, 477, 157, 4, 21, 153, 153, 483, 558, + 541, 542, 558, 156, 159, 535, 156, 153, 493, 494, + 495, 156, 156, 156, 499, 156, 27, 28, 156, 156, + 579, 36, 156, 579, 159, 566, 156, 568, 569, 21, + 156, 156, 156, 518, 119, 120, 121, 122, 123, 124, + 125, 126, 127, 128, 153, 21, 576, 153, 533, 10, + 11, 12, 13, 14, 15, 16, 17, 355, 356, 357, + 65, 591, 21, 21, 65, 363, 65, 65, 598, 318, + 65, 33, 602, 603, 25, 478, 319, 44, 108, 377, + 378, 3, 222, 477, 19, 597, 429, 499, 458, -1, + -1, -1, -1, -1, 5, 6, -1, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, -1, + 21, 22, -1, 24, 125, 126, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 136, 137, 138, 426, -1, + 428, 5, 6, -1, 432, -1, -1, 48, -1, -1, + -1, -1, 440, 441, 442, -1, -1, 20, 22, 22, + 24, 24, 26, -1, -1, -1, -1, -1, 31, 32, + 33, -1, -1, -1, 38, 39, -1, -1, 41, 42, + 43, 44, 45, 46, 47, -1, -1, 50, 51, -1, + -1, -1, -1, 481, 482, 58, 484, 485, -1, 62, + -1, -1, -1, 491, -1, -1, -1, -1, -1, -1, + -1, -1, 500, -1, -1, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, + 104, -1, -1, -1, -1, -1, 110, 535, 112, -1, + 114, 115, 116, 154, -1, -1, 157, -1, -1, 160, + -1, 162, 163, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 139, 140, 141, 142, 143, + 144, 145, 146, 147, 148, 149, 150, 151, 576, -1, + -1, -1, -1, 157, -1, -1, 160, -1, 162, -1, + -1, 165, -1, 591, -1, -1, -1, -1, -1, -1, + 598, -1, -1, -1, 602, 603, 5, 6, -1, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, -1, 21, 22, -1, 24, -1, -1, -1, 3, + 4, 5, 6, 7, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 22, 48, + 24, -1, 26, 27, 28, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 38, 39, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 61, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, + 104, -1, -1, -1, -1, -1, 110, -1, 112, -1, + 114, 115, 116, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 154, 3, 4, 157, -1, + 7, 160, -1, 162, 163, 139, 140, 141, 142, 143, + 144, 145, 146, 147, 148, 149, 150, 151, -1, 26, + 27, 28, -1, -1, -1, -1, 160, -1, -1, -1, + -1, 38, 39, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 61, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 97, 98, 99, 100, 101, 102, 103, 104, -1, -1, + -1, -1, -1, 110, -1, 112, -1, 114, 115, 116, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 139, 140, 141, 142, 143, 144, 145, 146, + 147, 148, 149, 150, 151, -1, -1, -1, -1, -1, + -1, 5, 6, 160, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, -1, 21, 22, -1, + 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 37, -1, -1, -1, -1, -1, -1, + -1, -1, 5, 6, 48, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, -1, 21, 22, + -1, 24, 5, 6, -1, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, -1, 21, 22, + -1, 24, -1, -1, -1, 48, -1, -1, -1, -1, + -1, -1, -1, -1, 37, -1, -1, -1, -1, -1, + -1, -1, -1, 5, 6, 48, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, -1, 21, + 22, -1, 24, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 37, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 48, -1, -1, -1, + 154, -1, -1, 157, -1, -1, 160, -1, 162, -1, + 5, 6, -1, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, -1, 21, 22, -1, 24, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 154, 37, -1, 157, -1, 159, 160, -1, 162, + -1, -1, -1, 48, -1, -1, -1, -1, -1, -1, + -1, 154, -1, -1, 157, -1, -1, 160, -1, 162, + 5, 6, -1, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, -1, 21, 22, -1, 24, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 154, -1, -1, 157, -1, -1, 160, -1, + 162, 5, 6, 48, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, -1, 21, 22, -1, + 24, 5, 6, -1, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, -1, 21, 22, -1, + 24, -1, -1, -1, 48, -1, -1, -1, -1, 154, + -1, -1, 157, -1, -1, 160, -1, 162, -1, -1, + -1, -1, 5, 6, 48, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, -1, 21, 22, + -1, 24, 5, 6, -1, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, -1, 21, 22, + -1, 24, -1, -1, -1, 48, -1, -1, -1, 154, + -1, -1, 157, -1, -1, 160, -1, 162, -1, -1, + -1, -1, -1, -1, -1, 48, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 154, -1, -1, 157, -1, -1, 160, -1, 162, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 154, -1, -1, 157, -1, -1, 160, -1, 162, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 35, -1, -1, -1, -1, -1, + -1, 154, -1, -1, 157, -1, -1, 160, 49, 162, + -1, -1, -1, -1, -1, -1, -1, -1, 59, 60, + -1, 154, -1, -1, 157, -1, -1, 160, -1, 162, + -1, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, + 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, + 101, 102, 103, 104, 105, 106, 107, -1, -1, 110, + 111, 112, 113, 114, 115, 116, 117, 118, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 139, 140, + 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, + 151 +}; -/* Note: there must be only one dollar sign in this file. - It is replaced by the list of actions, each action - as one case of the switch. */ +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ +static const yytype_uint8 yystos[] = +{ + 0, 200, 201, 202, 0, 25, 31, 41, 42, 43, + 44, 45, 46, 47, 62, 181, 219, 222, 224, 232, + 22, 24, 51, 58, 62, 180, 212, 224, 225, 61, + 220, 23, 233, 234, 30, 163, 221, 233, 52, 53, + 54, 71, 209, 152, 61, 20, 45, 47, 50, 181, + 152, 45, 47, 223, 24, 207, 64, 65, 66, 67, + 68, 69, 70, 182, 217, 180, 238, 152, 152, 152, + 152, 157, 210, 207, 5, 6, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 21, 48, + 154, 157, 160, 162, 167, 189, 190, 191, 192, 193, + 212, 229, 32, 33, 199, 199, 199, 199, 226, 4, + 189, 29, 162, 218, 35, 49, 59, 60, 72, 73, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, + 104, 105, 106, 107, 110, 111, 112, 113, 114, 115, + 116, 117, 118, 139, 140, 141, 142, 143, 144, 145, + 146, 147, 148, 149, 150, 151, 169, 170, 171, 174, + 175, 235, 236, 242, 243, 245, 246, 24, 55, 56, + 208, 4, 24, 24, 211, 4, 4, 4, 162, 8, + 163, 193, 194, 155, 164, 191, 191, 191, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 176, + 177, 179, 191, 196, 217, 212, 191, 231, 59, 8, + 231, 9, 21, 10, 11, 12, 13, 14, 15, 16, + 17, 176, 177, 178, 182, 119, 120, 121, 122, 123, + 124, 125, 126, 127, 128, 172, 27, 28, 125, 126, + 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, + 137, 138, 173, 191, 191, 231, 191, 191, 239, 231, + 231, 231, 231, 231, 231, 231, 191, 191, 191, 231, + 231, 182, 108, 109, 153, 159, 158, 158, 163, 194, + 153, 163, 37, 194, 195, 205, 206, 204, 27, 28, + 3, 4, 168, 4, 7, 26, 38, 39, 103, 104, + 110, 112, 114, 115, 116, 157, 160, 162, 165, 169, + 170, 171, 174, 175, 197, 229, 203, 155, 3, 4, + 7, 26, 27, 28, 38, 39, 61, 160, 197, 228, + 229, 230, 230, 230, 230, 189, 191, 191, 153, 184, + 153, 184, 230, 157, 153, 153, 153, 153, 153, 153, + 153, 153, 230, 230, 230, 153, 36, 189, 191, 231, + 24, 193, 193, 161, 163, 193, 153, 156, 153, 187, + 187, 187, 172, 173, 155, 155, 155, 155, 155, 159, + 196, 198, 162, 198, 163, 198, 24, 155, 155, 155, + 155, 155, 187, 37, 191, 214, 215, 216, 63, 227, + 198, 153, 153, 230, 230, 230, 15, 57, 15, 153, + 244, 230, 157, 231, 191, 231, 231, 231, 191, 191, + 153, 153, 153, 231, 191, 230, 230, 153, 159, 161, + 161, 37, 34, 57, 185, 188, 155, 155, 196, 196, + 196, 196, 196, 153, 159, 163, 193, 198, 161, 163, + 196, 196, 196, 196, 196, 212, 213, 153, 156, 24, + 161, 21, 21, 155, 153, 153, 230, 4, 230, 231, + 240, 153, 230, 153, 153, 153, 230, 230, 230, 155, + 191, 24, 4, 187, 196, 196, 244, 153, 153, 153, + 153, 196, 161, 163, 153, 153, 153, 153, 36, 37, + 214, 185, 186, 153, 230, 230, 240, 241, 230, 230, + 153, 184, 184, 153, 230, 153, 231, 231, 231, 241, + 230, 153, 153, 156, 196, 196, 196, 196, 161, 196, + 196, 196, 196, 191, 57, 183, 24, 153, 157, 156, + 231, 159, 230, 156, 196, 196, 153, 156, 153, 153, + 156, 156, 156, 156, 156, 4, 21, 159, 178, 237, + 36, 159, 156, 156, 196, 196, 196, 230, 228, 159, + 178, 21, 156, 156, 156, 153, 228, 230, 21, 153, + 235, 230, 21, 21, 230, 230 +}; #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) -#define YYEMPTY -2 +#define YYEMPTY (-2) #define YYEOF 0 + #define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrlab1 -/* Like YYERROR except do call yyerror. - This remains here temporarily to ease the - transition to the new meaning of YYERROR, for GCC. +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + + +/* Like YYERROR except do call yyerror. This remains here temporarily + to ease the transition to the new meaning of YYERROR, for GCC. Once GCC version 2 has supplanted version 1, this can go. */ + #define YYFAIL goto yyerrlab + #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(token, value) \ + +#define YYBACKUP(Token, Value) \ do \ if (yychar == YYEMPTY && yylen == 1) \ - { yychar = (token), yylval = (value); \ - yychar1 = YYTRANSLATE (yychar); \ - YYPOPSTACK; \ + { \ + yychar = (Token); \ + yylval = (Value); \ + yytoken = YYTRANSLATE (yychar); \ + YYPOPSTACK (1); \ goto yybackup; \ } \ else \ - { yyerror ("syntax error: cannot back up"); YYERROR; } \ -while (0) + { \ + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ +while (YYID (0)) + #define YYTERROR 1 #define YYERRCODE 256 -#ifndef YYPURE -#define YYLEX yylex() + +/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. + If N is 0, then set CURRENT to the empty location which ends + the previous symbol: RHS[0] (always defined). */ + +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) +#ifndef YYLLOC_DEFAULT +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (YYID (N)) \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ + while (YYID (0)) #endif -#ifdef YYPURE -#ifdef YYLSP_NEEDED -#ifdef YYLEX_PARAM -#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM) -#else -#define YYLEX yylex(&yylval, &yylloc) + +/* YY_LOCATION_PRINT -- Print the location on the stream. + This macro was not mandated originally: define only if we know + we won't break user code: when these are the locations we know. */ + +#ifndef YY_LOCATION_PRINT +# if YYLTYPE_IS_TRIVIAL +# define YY_LOCATION_PRINT(File, Loc) \ + fprintf (File, "%d.%d-%d.%d", \ + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) +# else +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif #endif -#else /* not YYLSP_NEEDED */ + + +/* YYLEX -- calling `yylex' with the right arguments. */ + #ifdef YYLEX_PARAM -#define YYLEX yylex(&yylval, YYLEX_PARAM) +# define YYLEX yylex (YYLEX_PARAM) #else -#define YYLEX yylex(&yylval) +# define YYLEX yylex () #endif -#endif /* not YYLSP_NEEDED */ + +/* Enable debugging if requested. */ +#if YYDEBUG + +# ifndef YYFPRINTF +# include /* INFRINGES ON USER NAME SPACE */ +# define YYFPRINTF fprintf +# endif + +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (YYID (0)) + +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (YYID (0)) + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_value_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; #endif +{ + if (!yyvaluep) + return; +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# else + YYUSE (yyoutput); +# endif + switch (yytype) + { + default: + break; + } +} + -/* If nonreentrant, generate the variables here */ +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ -#ifndef YYPURE +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif +{ + if (yytype < YYNTOKENS) + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + + yy_symbol_value_print (yyoutput, yytype, yyvaluep); + YYFPRINTF (yyoutput, ")"); +} -int yychar; /* the lookahead symbol */ -YYSTYPE yylval; /* the semantic value of the */ - /* lookahead symbol */ +/*------------------------------------------------------------------. +| yy_stack_print -- Print the state stack from its BOTTOM up to its | +| TOP (included). | +`------------------------------------------------------------------*/ -#ifdef YYLSP_NEEDED -YYLTYPE yylloc; /* location data for the lookahead */ - /* symbol */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) +#else +static void +yy_stack_print (bottom, top) + yytype_int16 *bottom; + yytype_int16 *top; #endif +{ + YYFPRINTF (stderr, "Stack now"); + for (; bottom <= top; ++bottom) + YYFPRINTF (stderr, " %d", *bottom); + YYFPRINTF (stderr, "\n"); +} + +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (YYID (0)) -int yynerrs; /* number of parse errors so far */ -#endif /* not YYPURE */ -#if YYDEBUG != 0 -int yydebug; /* nonzero means print parse trace */ -/* Since this is uninitialized, it does not stop multiple parsers - from coexisting. */ +/*------------------------------------------------. +| Report that the YYRULE is going to be reduced. | +`------------------------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_reduce_print (YYSTYPE *yyvsp, int yyrule) +#else +static void +yy_reduce_print (yyvsp, yyrule) + YYSTYPE *yyvsp; + int yyrule; #endif +{ + int yynrhs = yyr2[yyrule]; + int yyi; + unsigned long int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", + yyrule - 1, yylno); + /* The symbols being reduced. */ + for (yyi = 0; yyi < yynrhs; yyi++) + { + fprintf (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], + &(yyvsp[(yyi + 1) - (yynrhs)]) + ); + fprintf (stderr, "\n"); + } +} + +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyvsp, Rule); \ +} while (YYID (0)) -/* YYINITDEPTH indicates the initial size of the parser's stacks */ +/* Nonzero means print parse trace. It is left uninitialized so that + multiple parsers can coexist. */ +int yydebug; +#else /* !YYDEBUG */ +# define YYDPRINTF(Args) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YY_STACK_PRINT(Bottom, Top) +# define YY_REDUCE_PRINT(Rule) +#endif /* !YYDEBUG */ + +/* YYINITDEPTH -- initial size of the parser's stacks. */ #ifndef YYINITDEPTH -#define YYINITDEPTH 200 +# define YYINITDEPTH 200 #endif -/* YYMAXDEPTH is the maximum size the stacks can grow to - (effective only if the built-in stack extension method is used). */ +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only + if the built-in stack extension method is used). -#if YYMAXDEPTH == 0 -#undef YYMAXDEPTH -#endif + Do not make this value too large; the results are undefined if + YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) + evaluated with infinite-precision integer arithmetic. */ #ifndef YYMAXDEPTH -#define YYMAXDEPTH 10000 +# define YYMAXDEPTH 10000 #endif + -/* Define __yy_memcpy. Note that the size argument - should be passed with type unsigned int, because that is what the non-GCC - definitions require. With GCC, __builtin_memcpy takes an arg - of type size_t, but it can handle unsigned int. */ - -#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ -#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT) -#else /* not GNU C or C++ */ -#ifndef __cplusplus - -/* This is the most reliable way to avoid incompatibilities - in available built-in functions on various systems. */ -static void -__yy_memcpy (to, from, count) - char *to; - char *from; - unsigned int count; + +#if YYERROR_VERBOSE + +# ifndef yystrlen +# if defined __GLIBC__ && defined _STRING_H +# define yystrlen strlen +# else +/* Return the length of YYSTR. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static YYSIZE_T +yystrlen (const char *yystr) +#else +static YYSIZE_T +yystrlen (yystr) + const char *yystr; +#endif +{ + YYSIZE_T yylen; + for (yylen = 0; yystr[yylen]; yylen++) + continue; + return yylen; +} +# endif +# endif + +# ifndef yystpcpy +# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE +# define yystpcpy stpcpy +# else +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in + YYDEST. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static char * +yystpcpy (char *yydest, const char *yysrc) +#else +static char * +yystpcpy (yydest, yysrc) + char *yydest; + const char *yysrc; +#endif { - register char *f = from; - register char *t = to; - register int i = count; + char *yyd = yydest; + const char *yys = yysrc; + + while ((*yyd++ = *yys++) != '\0') + continue; - while (i-- > 0) - *t++ = *f++; + return yyd - 1; } +# endif +# endif + +# ifndef yytnamerr +/* Copy to YYRES the contents of YYSTR after stripping away unnecessary + quotes and backslashes, so that it's suitable for yyerror. The + heuristic is that double-quoting is unnecessary unless the string + contains an apostrophe, a comma, or backslash (other than + backslash-backslash). YYSTR is taken from yytname. If YYRES is + null, do not copy; instead, return the length of what the result + would have been. */ +static YYSIZE_T +yytnamerr (char *yyres, const char *yystr) +{ + if (*yystr == '"') + { + YYSIZE_T yyn = 0; + char const *yyp = yystr; + + for (;;) + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } + do_not_strip_quotes: ; + } -#else /* __cplusplus */ + if (! yyres) + return yystrlen (yystr); -/* This is the most reliable way to avoid incompatibilities - in available built-in functions on various systems. */ -static void -__yy_memcpy (char *to, char *from, unsigned int count) + return yystpcpy (yyres, yystr) - yyres; +} +# endif + +/* Copy into YYRESULT an error message about the unexpected token + YYCHAR while in state YYSTATE. Return the number of bytes copied, + including the terminating null byte. If YYRESULT is null, do not + copy anything; just return the number of bytes that would be + copied. As a special case, return 0 if an ordinary "syntax error" + message will do. Return YYSIZE_MAXIMUM if overflow occurs during + size calculation. */ +static YYSIZE_T +yysyntax_error (char *yyresult, int yystate, int yychar) { - register char *t = to; - register char *f = from; - register int i = count; + int yyn = yypact[yystate]; - while (i-- > 0) - *t++ = *f++; + if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) + return 0; + else + { + int yytype = YYTRANSLATE (yychar); + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + int yysize_overflow = 0; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + int yyx; + +# if 0 + /* This is so xgettext sees the translatable formats that are + constructed on the fly. */ + YY_("syntax error, unexpected %s"); + YY_("syntax error, unexpected %s, expecting %s"); + YY_("syntax error, unexpected %s, expecting %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); +# endif + char *yyfmt; + char const *yyf; + static char const yyunexpected[] = "syntax error, unexpected %s"; + static char const yyexpecting[] = ", expecting %s"; + static char const yyor[] = " or %s"; + char yyformat[sizeof yyunexpected + + sizeof yyexpecting - 1 + + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) + * (sizeof yyor - 1))]; + char const *yyprefix = yyexpecting; + + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yycount = 1; + + yyarg[0] = yytname[yytype]; + yyfmt = yystpcpy (yyformat, yyunexpected); + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + yyformat[sizeof yyunexpected - 1] = '\0'; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + yyfmt = yystpcpy (yyfmt, yyprefix); + yyprefix = yyor; + } + + yyf = YY_(yyformat); + yysize1 = yysize + yystrlen (yyf); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + + if (yysize_overflow) + return YYSIZE_MAXIMUM; + + if (yyresult) + { + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + char *yyp = yyresult; + int yyi = 0; + while ((*yyp = *yyf) != '\0') + { + if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyf += 2; + } + else + { + yyp++; + yyf++; + } + } + } + return yysize; + } } +#endif /* YYERROR_VERBOSE */ + +/*-----------------------------------------------. +| Release the memory associated to this symbol. | +`-----------------------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +#else +static void +yydestruct (yymsg, yytype, yyvaluep) + const char *yymsg; + int yytype; + YYSTYPE *yyvaluep; #endif -#endif +{ + YYUSE (yyvaluep); + + if (!yymsg) + yymsg = "Deleting"; + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + + switch (yytype) + { + + default: + break; + } +} -#line 217 "/usr/share/bison.simple" -/* The user can define YYPARSE_PARAM as the name of an argument to be passed - into yyparse. The argument should have type void *. - It should actually point to an object. - Grammar actions can access the variable by casting it - to the proper pointer type. */ +/* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM -#ifdef __cplusplus -#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM -#define YYPARSE_PARAM_DECL -#else /* not __cplusplus */ -#define YYPARSE_PARAM_ARG YYPARSE_PARAM -#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; -#endif /* not __cplusplus */ -#else /* not YYPARSE_PARAM */ -#define YYPARSE_PARAM_ARG -#define YYPARSE_PARAM_DECL -#endif /* not YYPARSE_PARAM */ - -/* Prevent warning if -Wstrict-prototypes. */ -#ifdef __GNUC__ -#ifdef YYPARSE_PARAM -int yyparse (void *); +#if defined __STDC__ || defined __cplusplus +int yyparse (void *YYPARSE_PARAM); #else -int yyparse (void); +int yyparse (); #endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int yyparse (void); +#else +int yyparse (); #endif +#endif /* ! YYPARSE_PARAM */ -int -yyparse(YYPARSE_PARAM_ARG) - YYPARSE_PARAM_DECL -{ - register int yystate; - register int yyn; - register short *yyssp; - register YYSTYPE *yyvsp; - int yyerrstatus; /* number of tokens to shift before error messages enabled */ - int yychar1 = 0; /* lookahead token as an internal (translated) token number */ - short yyssa[YYINITDEPTH]; /* the state stack */ - YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */ - short *yyss = yyssa; /* refer to the stacks thru separate pointers */ - YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */ +/* The look-ahead symbol. */ +int yychar; + +/* The semantic value of the look-ahead symbol. */ +YYSTYPE yylval; + +/* Number of syntax errors so far. */ +int yynerrs; + -#ifdef YYLSP_NEEDED - YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */ - YYLTYPE *yyls = yylsa; - YYLTYPE *yylsp; -#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) +/*----------. +| yyparse. | +`----------*/ + +#ifdef YYPARSE_PARAM +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void *YYPARSE_PARAM) #else -#define YYPOPSTACK (yyvsp--, yyssp--) +int +yyparse (YYPARSE_PARAM) + void *YYPARSE_PARAM; #endif +#else /* ! YYPARSE_PARAM */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void) +#else +int +yyparse () - int yystacksize = YYINITDEPTH; - int yyfree_stacks = 0; - -#ifdef YYPURE - int yychar; - YYSTYPE yylval; - int yynerrs; -#ifdef YYLSP_NEEDED - YYLTYPE yylloc; #endif +#endif +{ + + int yystate; + int yyn; + int yyresult; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; + /* Look-ahead token as an internal (translated) token number. */ + int yytoken = 0; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; #endif - YYSTYPE yyval; /* the variable used to return */ - /* semantic values from the action */ - /* routines */ + /* Three stacks and their tools: + `yyss': related to states, + `yyvs': related to semantic values, + `yyls': related to locations. - int yylen; + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Starting parse\n"); -#endif + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss = yyssa; + yytype_int16 *yyssp; + + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; + YYSTYPE *yyvsp; + + + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + + YYSIZE_T yystacksize = YYINITDEPTH; + + /* The variables used to return semantic value and location from the + action routines. */ + YYSTYPE yyval; + + + /* The number of symbols on the RHS of the reduced rule. + Keep to zero when no symbol should be popped. */ + int yylen = 0; + + YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; yyerrstatus = 0; @@ -3071,574 +3928,584 @@ yyparse(YYPARSE_PARAM_ARG) so that they stay on the same level as the state stack. The wasted elements are never initialized. */ - yyssp = yyss - 1; + yyssp = yyss; yyvsp = yyvs; -#ifdef YYLSP_NEEDED - yylsp = yyls; -#endif -/* Push a new state, which is found in yystate . */ -/* In all cases, when you get here, the value and location stacks - have just been pushed. so pushing a state here evens the stacks. */ -yynewstate: + goto yysetstate; - *++yyssp = yystate; +/*------------------------------------------------------------. +| yynewstate -- Push a new state, which is found in yystate. | +`------------------------------------------------------------*/ + yynewstate: + /* In all cases, when you get here, the value and location stacks + have just been pushed. So pushing a state here evens the stacks. */ + yyssp++; - if (yyssp >= yyss + yystacksize - 1) - { - /* Give user a chance to reallocate the stack */ - /* Use copies of these so that the &'s don't force the real ones into memory. */ - YYSTYPE *yyvs1 = yyvs; - short *yyss1 = yyss; -#ifdef YYLSP_NEEDED - YYLTYPE *yyls1 = yyls; -#endif + yysetstate: + *yyssp = yystate; + if (yyss + yystacksize - 1 <= yyssp) + { /* Get the current used size of the three stacks, in elements. */ - int size = yyssp - yyss + 1; + YYSIZE_T yysize = yyssp - yyss + 1; #ifdef yyoverflow - /* Each stack pointer address is followed by the size of - the data in use in that stack, in bytes. */ -#ifdef YYLSP_NEEDED - /* This used to be a conditional around just the two extra args, - but that might be undefined if yyoverflow is a macro. */ - yyoverflow("parser stack overflow", - &yyss1, size * sizeof (*yyssp), - &yyvs1, size * sizeof (*yyvsp), - &yyls1, size * sizeof (*yylsp), - &yystacksize); -#else - yyoverflow("parser stack overflow", - &yyss1, size * sizeof (*yyssp), - &yyvs1, size * sizeof (*yyvsp), - &yystacksize); -#endif - - yyss = yyss1; yyvs = yyvs1; -#ifdef YYLSP_NEEDED - yyls = yyls1; -#endif + { + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; + + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + + &yystacksize); + + yyss = yyss1; + yyvs = yyvs1; + } #else /* no yyoverflow */ +# ifndef YYSTACK_RELOCATE + goto yyexhaustedlab; +# else /* Extend the stack our own way. */ - if (yystacksize >= YYMAXDEPTH) - { - yyerror("parser stack overflow"); - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -#ifdef YYLSP_NEEDED - free (yyls); -#endif - } - return 2; - } + if (YYMAXDEPTH <= yystacksize) + goto yyexhaustedlab; yystacksize *= 2; - if (yystacksize > YYMAXDEPTH) + if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; -#ifndef YYSTACK_USE_ALLOCA - yyfree_stacks = 1; -#endif - yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp)); - __yy_memcpy ((char *)yyss, (char *)yyss1, - size * (unsigned int) sizeof (*yyssp)); - yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp)); - __yy_memcpy ((char *)yyvs, (char *)yyvs1, - size * (unsigned int) sizeof (*yyvsp)); -#ifdef YYLSP_NEEDED - yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp)); - __yy_memcpy ((char *)yyls, (char *)yyls1, - size * (unsigned int) sizeof (*yylsp)); -#endif + + { + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss); + YYSTACK_RELOCATE (yyvs); + +# undef YYSTACK_RELOCATE + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); + } +# endif #endif /* no yyoverflow */ - yyssp = yyss + size - 1; - yyvsp = yyvs + size - 1; -#ifdef YYLSP_NEEDED - yylsp = yyls + size - 1; -#endif + yyssp = yyss + yysize - 1; + yyvsp = yyvs + yysize - 1; -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Stack size increased to %d\n", yystacksize); -#endif - if (yyssp >= yyss + yystacksize - 1) + YYDPRINTF ((stderr, "Stack size increased to %lu\n", + (unsigned long int) yystacksize)); + + if (yyss + yystacksize - 1 <= yyssp) YYABORT; } -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Entering state %d\n", yystate); -#endif + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); goto yybackup; - yybackup: -/* Do appropriate processing given the current state. */ -/* Read a lookahead token if we need one and don't already have one. */ -/* yyresume: */ +/*-----------. +| yybackup. | +`-----------*/ +yybackup: - /* First try to decide what to do without reference to lookahead token. */ + /* Do appropriate processing given the current state. Read a + look-ahead token if we need one and don't already have one. */ + /* First try to decide what to do without reference to look-ahead token. */ yyn = yypact[yystate]; - if (yyn == YYFLAG) + if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a lookahead token if don't already have one. */ - - /* yychar is either YYEMPTY or YYEOF - or a valid token in external form. */ + /* Not known => get a look-ahead token if don't already have one. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ if (yychar == YYEMPTY) { -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Reading a token: "); -#endif + YYDPRINTF ((stderr, "Reading a token: ")); yychar = YYLEX; } - /* Convert token to internal form (in yychar1) for indexing tables with */ - - if (yychar <= 0) /* This means end of input. */ + if (yychar <= YYEOF) { - yychar1 = 0; - yychar = YYEOF; /* Don't call YYLEX any more */ - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Now at end of input.\n"); -#endif + yychar = yytoken = YYEOF; + YYDPRINTF ((stderr, "Now at end of input.\n")); } else { - yychar1 = YYTRANSLATE(yychar); - -#if YYDEBUG != 0 - if (yydebug) - { - fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]); - /* Give the individual parser a way to print the precise meaning - of a token, for further debugging info. */ -#ifdef YYPRINT - YYPRINT (stderr, yychar, yylval); -#endif - fprintf (stderr, ")\n"); - } -#endif + yytoken = YYTRANSLATE (yychar); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); } - yyn += yychar1; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1) + /* If the proper action on seeing token YYTOKEN is to reduce or to + detect an error, take that action. */ + yyn += yytoken; + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) goto yydefault; - yyn = yytable[yyn]; - - /* yyn is what to do for this token type in this state. - Negative => reduce, -yyn is rule number. - Positive => shift, yyn is new state. - New state is final state => don't bother to shift, - just return success. - 0, or most negative number => error. */ - - if (yyn < 0) + if (yyn <= 0) { - if (yyn == YYFLAG) + if (yyn == 0 || yyn == YYTABLE_NINF) goto yyerrlab; yyn = -yyn; goto yyreduce; } - else if (yyn == 0) - goto yyerrlab; if (yyn == YYFINAL) YYACCEPT; - /* Shift the lookahead token. */ + /* Count tokens shifted since error; after three, turn off error + status. */ + if (yyerrstatus) + yyerrstatus--; -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]); -#endif + /* Shift the look-ahead token. */ + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - /* Discard the token being shifted unless it is eof. */ + /* Discard the shifted token unless it is eof. */ if (yychar != YYEOF) yychar = YYEMPTY; + yystate = yyn; *++yyvsp = yylval; -#ifdef YYLSP_NEEDED - *++yylsp = yylloc; -#endif - - /* count tokens shifted since error; after three, turn off error status. */ - if (yyerrstatus) yyerrstatus--; - yystate = yyn; goto yynewstate; -/* Do the default action for the current state. */ -yydefault: +/*-----------------------------------------------------------. +| yydefault -- do the default action for the current state. | +`-----------------------------------------------------------*/ +yydefault: yyn = yydefact[yystate]; if (yyn == 0) goto yyerrlab; + goto yyreduce; -/* Do a reduction. yyn is the number of a rule to reduce with. */ + +/*-----------------------------. +| yyreduce -- Do a reduction. | +`-----------------------------*/ yyreduce: + /* yyn is the number of a rule to reduce with. */ yylen = yyr2[yyn]; - if (yylen > 0) - yyval = yyvsp[1-yylen]; /* implement default value of the action */ -#if YYDEBUG != 0 - if (yydebug) + /* If YYLEN is nonzero, implement the default value of the action: + `$$ = $1'. + + Otherwise, the following line sets YYVAL to garbage. + This behavior is undocumented and Bison + users should not rely upon it. Assigning to YYVAL + unconditionally makes the parser a bit smaller, and it avoids a + GCC warning that YYVAL may be used uninitialized. */ + yyval = yyvsp[1-yylen]; + + + YY_REDUCE_PRINT (yyn); + switch (yyn) + { + case 3: +#line 1821 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(1) - (1)].UIntVal) > (uint32_t)INT32_MAX) // Outside of my range! + error("Value too large for type"); + (yyval.SIntVal) = (int32_t)(yyvsp[(1) - (1)].UIntVal); + ;} + break; + + case 5: +#line 1830 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" { - int i; + if ((yyvsp[(1) - (1)].UInt64Val) > (uint64_t)INT64_MAX) // Outside of my range! + error("Value too large for type"); + (yyval.SInt64Val) = (int64_t)(yyvsp[(1) - (1)].UInt64Val); + ;} + break; - fprintf (stderr, "Reducing via rule %d (line %d), ", - yyn, yyrline[yyn]); + case 26: +#line 1852 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_EQ; ;} + break; - /* Print the symbols being reduced, and their result. */ - for (i = yyprhs[yyn]; yyrhs[i] > 0; i++) - fprintf (stderr, "%s ", yytname[yyrhs[i]]); - fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]); - } -#endif + case 27: +#line 1852 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_NE; ;} + break; + case 28: +#line 1853 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_SLT; ;} + break; - switch (yyn) { + case 29: +#line 1853 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_SGT; ;} + break; -case 2: -#line 1895 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[0].UIntVal > (uint32_t)INT32_MAX) // Outside of my range! - error("Value too large for type"); - yyval.SIntVal = (int32_t)yyvsp[0].UIntVal; - ; - break;} -case 4: -#line 1904 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[0].UInt64Val > (uint64_t)INT64_MAX) // Outside of my range! - error("Value too large for type"); - yyval.SInt64Val = (int64_t)yyvsp[0].UInt64Val; - ; - break;} -case 25: -#line 1926 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_EQ; ; - break;} -case 26: -#line 1926 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_NE; ; - break;} -case 27: -#line 1927 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_SLT; ; - break;} -case 28: -#line 1927 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_SGT; ; - break;} -case 29: -#line 1928 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_SLE; ; - break;} -case 30: -#line 1928 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_SGE; ; - break;} -case 31: -#line 1929 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_ULT; ; - break;} -case 32: -#line 1929 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_UGT; ; - break;} -case 33: -#line 1930 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_ULE; ; - break;} -case 34: -#line 1930 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.IPred = ICmpInst::ICMP_UGE; ; - break;} -case 35: -#line 1934 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_OEQ; ; - break;} -case 36: -#line 1934 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_ONE; ; - break;} -case 37: -#line 1935 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_OLT; ; - break;} -case 38: -#line 1935 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_OGT; ; - break;} -case 39: -#line 1936 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_OLE; ; - break;} -case 40: -#line 1936 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_OGE; ; - break;} -case 41: -#line 1937 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_ORD; ; - break;} -case 42: -#line 1937 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_UNO; ; - break;} -case 43: -#line 1938 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_UEQ; ; - break;} -case 44: -#line 1938 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_UNE; ; - break;} -case 45: -#line 1939 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_ULT; ; - break;} -case 46: -#line 1939 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_UGT; ; - break;} -case 47: -#line 1940 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_ULE; ; - break;} -case 48: -#line 1940 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_UGE; ; - break;} -case 49: -#line 1941 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_TRUE; ; - break;} -case 50: -#line 1942 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.FPred = FCmpInst::FCMP_FALSE; ; - break;} -case 80: -#line 1973 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.StrVal = yyvsp[-1].StrVal; - ; - break;} -case 81: -#line 1976 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.StrVal = 0; - ; - break;} -case 82: -#line 1981 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::InternalLinkage; ; - break;} -case 83: -#line 1982 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::LinkOnceLinkage; ; - break;} -case 84: -#line 1983 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::WeakLinkage; ; - break;} -case 85: -#line 1984 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::AppendingLinkage; ; - break;} -case 86: -#line 1985 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::DLLImportLinkage; ; - break;} -case 87: -#line 1986 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::DLLExportLinkage; ; - break;} -case 88: -#line 1987 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::ExternalWeakLinkage; ; - break;} -case 89: -#line 1988 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::ExternalLinkage; ; - break;} -case 90: -#line 1992 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.UIntVal = lastCallingConv = OldCallingConv::C; ; - break;} -case 91: -#line 1993 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.UIntVal = lastCallingConv = OldCallingConv::C; ; - break;} -case 92: -#line 1994 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.UIntVal = lastCallingConv = OldCallingConv::CSRet; ; - break;} -case 93: -#line 1995 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.UIntVal = lastCallingConv = OldCallingConv::Fast; ; - break;} -case 94: -#line 1996 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.UIntVal = lastCallingConv = OldCallingConv::Cold; ; - break;} -case 95: -#line 1997 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.UIntVal = lastCallingConv = OldCallingConv::X86_StdCall; ; - break;} -case 96: -#line 1998 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.UIntVal = lastCallingConv = OldCallingConv::X86_FastCall; ; - break;} -case 97: -#line 1999 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if ((unsigned)yyvsp[0].UInt64Val != yyvsp[0].UInt64Val) + case 30: +#line 1854 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_SLE; ;} + break; + + case 31: +#line 1854 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_SGE; ;} + break; + + case 32: +#line 1855 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_ULT; ;} + break; + + case 33: +#line 1855 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_UGT; ;} + break; + + case 34: +#line 1856 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_ULE; ;} + break; + + case 35: +#line 1856 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.IPred) = ICmpInst::ICMP_UGE; ;} + break; + + case 36: +#line 1860 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_OEQ; ;} + break; + + case 37: +#line 1860 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_ONE; ;} + break; + + case 38: +#line 1861 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_OLT; ;} + break; + + case 39: +#line 1861 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_OGT; ;} + break; + + case 40: +#line 1862 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_OLE; ;} + break; + + case 41: +#line 1862 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_OGE; ;} + break; + + case 42: +#line 1863 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_ORD; ;} + break; + + case 43: +#line 1863 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_UNO; ;} + break; + + case 44: +#line 1864 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_UEQ; ;} + break; + + case 45: +#line 1864 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_UNE; ;} + break; + + case 46: +#line 1865 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_ULT; ;} + break; + + case 47: +#line 1865 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_UGT; ;} + break; + + case 48: +#line 1866 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_ULE; ;} + break; + + case 49: +#line 1866 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_UGE; ;} + break; + + case 50: +#line 1867 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_TRUE; ;} + break; + + case 51: +#line 1868 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.FPred) = FCmpInst::FCMP_FALSE; ;} + break; + + case 81: +#line 1899 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal); + ;} + break; + + case 82: +#line 1902 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.StrVal) = 0; + ;} + break; + + case 83: +#line 1907 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::InternalLinkage; ;} + break; + + case 84: +#line 1908 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;} + break; + + case 85: +#line 1909 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::WeakLinkage; ;} + break; + + case 86: +#line 1910 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;} + break; + + case 87: +#line 1911 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;} + break; + + case 88: +#line 1912 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;} + break; + + case 89: +#line 1913 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;} + break; + + case 90: +#line 1914 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} + break; + + case 91: +#line 1918 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.UIntVal) = lastCallingConv = OldCallingConv::C; ;} + break; + + case 92: +#line 1919 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.UIntVal) = lastCallingConv = OldCallingConv::C; ;} + break; + + case 93: +#line 1920 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.UIntVal) = lastCallingConv = OldCallingConv::CSRet; ;} + break; + + case 94: +#line 1921 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.UIntVal) = lastCallingConv = OldCallingConv::Fast; ;} + break; + + case 95: +#line 1922 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.UIntVal) = lastCallingConv = OldCallingConv::Cold; ;} + break; + + case 96: +#line 1923 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.UIntVal) = lastCallingConv = OldCallingConv::X86_StdCall; ;} + break; + + case 97: +#line 1924 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.UIntVal) = lastCallingConv = OldCallingConv::X86_FastCall; ;} + break; + + case 98: +#line 1925 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val)) error("Calling conv too large"); - yyval.UIntVal = lastCallingConv = yyvsp[0].UInt64Val; - ; - break;} -case 98: -#line 2009 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.UIntVal = 0; ; - break;} -case 99: -#line 2010 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.UIntVal = yyvsp[0].UInt64Val; - if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal)) + (yyval.UIntVal) = lastCallingConv = (yyvsp[(2) - (2)].UInt64Val); + ;} + break; + + case 99: +#line 1935 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.UIntVal) = 0; ;} + break; + + case 100: +#line 1936 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val); + if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal))) error("Alignment must be a power of two"); - ; - break;} -case 100: -#line 2018 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.UIntVal = 0; ; - break;} -case 101: -#line 2019 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.UIntVal = yyvsp[0].UInt64Val; - if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal)) + ;} + break; + + case 101: +#line 1944 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.UIntVal) = 0; ;} + break; + + case 102: +#line 1945 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val); + if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal))) error("Alignment must be a power of two"); - ; - break;} -case 102: -#line 2027 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - for (unsigned i = 0, e = strlen(yyvsp[0].StrVal); i != e; ++i) - if (yyvsp[0].StrVal[i] == '"' || yyvsp[0].StrVal[i] == '\\') + ;} + break; + + case 103: +#line 1953 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + for (unsigned i = 0, e = strlen((yyvsp[(2) - (2)].StrVal)); i != e; ++i) + if ((yyvsp[(2) - (2)].StrVal)[i] == '"' || (yyvsp[(2) - (2)].StrVal)[i] == '\\') error("Invalid character in section name"); - yyval.StrVal = yyvsp[0].StrVal; - ; - break;} -case 103: -#line 2036 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.StrVal = 0; ; - break;} -case 104: -#line 2037 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.StrVal = yyvsp[0].StrVal; ; - break;} -case 105: -#line 2044 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{; - break;} -case 106: -#line 2045 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{; - break;} -case 107: -#line 2049 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - CurGV->setSection(yyvsp[0].StrVal); - free(yyvsp[0].StrVal); - ; - break;} -case 108: -#line 2053 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[0].UInt64Val != 0 && !isPowerOf2_32(yyvsp[0].UInt64Val)) + (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal); + ;} + break; + + case 104: +#line 1962 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.StrVal) = 0; ;} + break; + + case 105: +#line 1963 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;} + break; + + case 106: +#line 1970 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + {;} + break; + + case 107: +#line 1971 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + {;} + break; + + case 108: +#line 1975 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + CurGV->setSection((yyvsp[(1) - (1)].StrVal)); + free((yyvsp[(1) - (1)].StrVal)); + ;} + break; + + case 109: +#line 1979 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(2) - (2)].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[(2) - (2)].UInt64Val))) error("Alignment must be a power of two"); - CurGV->setAlignment(yyvsp[0].UInt64Val); + CurGV->setAlignment((yyvsp[(2) - (2)].UInt64Val)); - ; - break;} -case 110: -#line 2070 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.TypeVal.PAT = new PATypeHolder(yyvsp[0].PrimType.T); - yyval.TypeVal.S.makeSignless(); - ; - break;} -case 112: -#line 2078 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.TypeVal.PAT = new PATypeHolder(yyvsp[0].PrimType.T); - yyval.TypeVal.S.makeSignless(); - ; - break;} -case 113: -#line 2085 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + ;} + break; + + case 111: +#line 1996 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[(1) - (1)].PrimType).T); + (yyval.TypeVal).S.makeSignless(); + ;} + break; + + case 113: +#line 2004 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[(1) - (1)].PrimType).T); + (yyval.TypeVal).S.makeSignless(); + ;} + break; + + case 114: +#line 2011 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { if (!UpRefs.empty()) - error("Invalid upreference in type: " + (*yyvsp[0].TypeVal.PAT)->getDescription()); - yyval.TypeVal = yyvsp[0].TypeVal; - ; - break;} -case 126: -#line 2099 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.TypeVal.PAT = new PATypeHolder(yyvsp[0].PrimType.T); - yyval.TypeVal.S.copy(yyvsp[0].PrimType.S); - ; - break;} -case 127: -#line 2103 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.TypeVal.PAT = new PATypeHolder(OpaqueType::get()); - yyval.TypeVal.S.makeSignless(); - ; - break;} -case 128: -#line 2107 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Named types are also simple types... - yyval.TypeVal.S.copy(getTypeSign(yyvsp[0].ValIDVal)); - const Type* tmp = getType(yyvsp[0].ValIDVal); - yyval.TypeVal.PAT = new PATypeHolder(tmp); - ; - break;} -case 129: -#line 2112 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Type UpReference - if (yyvsp[0].UInt64Val > (uint64_t)~0U) + error("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal).PAT)->getDescription()); + (yyval.TypeVal) = (yyvsp[(1) - (1)].TypeVal); + ;} + break; + + case 127: +#line 2025 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[(1) - (1)].PrimType).T); + (yyval.TypeVal).S.copy((yyvsp[(1) - (1)].PrimType).S); + ;} + break; + + case 128: +#line 2029 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.TypeVal).PAT = new PATypeHolder(OpaqueType::get()); + (yyval.TypeVal).S.makeSignless(); + ;} + break; + + case 129: +#line 2033 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Named types are also simple types... + (yyval.TypeVal).S.copy(getTypeSign((yyvsp[(1) - (1)].ValIDVal))); + const Type* tmp = getType((yyvsp[(1) - (1)].ValIDVal)); + (yyval.TypeVal).PAT = new PATypeHolder(tmp); + ;} + break; + + case 130: +#line 2038 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Type UpReference + if ((yyvsp[(2) - (2)].UInt64Val) > (uint64_t)~0U) error("Value out of range"); OpaqueType *OT = OpaqueType::get(); // Use temporary placeholder - UpRefs.push_back(UpRefRecord((unsigned)yyvsp[0].UInt64Val, OT)); // Add to vector... - yyval.TypeVal.PAT = new PATypeHolder(OT); - yyval.TypeVal.S.makeSignless(); + UpRefs.push_back(UpRefRecord((unsigned)(yyvsp[(2) - (2)].UInt64Val), OT)); // Add to vector... + (yyval.TypeVal).PAT = new PATypeHolder(OT); + (yyval.TypeVal).S.makeSignless(); UR_OUT("New Upreference!\n"); - ; - break;} -case 130: -#line 2121 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Function derived type? - yyval.TypeVal.S.makeComposite(yyvsp[-3].TypeVal.S); + ;} + break; + + case 131: +#line 2047 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Function derived type? + (yyval.TypeVal).S.makeComposite((yyvsp[(1) - (4)].TypeVal).S); std::vector Params; - for (std::list::iterator I = yyvsp[-1].TypeList->begin(), - E = yyvsp[-1].TypeList->end(); I != E; ++I) { + for (std::list::iterator I = (yyvsp[(3) - (4)].TypeList)->begin(), + E = (yyvsp[(3) - (4)].TypeList)->end(); I != E; ++I) { Params.push_back(I->PAT->get()); - yyval.TypeVal.S.add(I->S); + (yyval.TypeVal).S.add(I->S); } bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); @@ -3653,151 +4520,164 @@ case 130: } const FunctionType *FTy = - FunctionType::get(yyvsp[-3].TypeVal.PAT->get(), Params, isVarArg, PAL); - - yyval.TypeVal.PAT = new PATypeHolder( HandleUpRefs(FTy, yyval.TypeVal.S) ); - delete yyvsp[-3].TypeVal.PAT; // Delete the return type handle - delete yyvsp[-1].TypeList; // Delete the argument list - ; - break;} -case 131: -#line 2148 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Sized array type? - yyval.TypeVal.S.makeComposite(yyvsp[-1].TypeVal.S); - yyval.TypeVal.PAT = new PATypeHolder(HandleUpRefs(ArrayType::get(yyvsp[-1].TypeVal.PAT->get(), - (unsigned)yyvsp[-3].UInt64Val), yyval.TypeVal.S)); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 132: -#line 2154 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Vector type? - const llvm::Type* ElemTy = yyvsp[-1].TypeVal.PAT->get(); - if ((unsigned)yyvsp[-3].UInt64Val != yyvsp[-3].UInt64Val) + FunctionType::get((yyvsp[(1) - (4)].TypeVal).PAT->get(), Params, isVarArg); + + (yyval.TypeVal).PAT = new PATypeHolder( HandleUpRefs(FTy, (yyval.TypeVal).S) ); + delete (yyvsp[(1) - (4)].TypeVal).PAT; // Delete the return type handle + delete (yyvsp[(3) - (4)].TypeList); // Delete the argument list + ;} + break; + + case 132: +#line 2074 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Sized array type? + (yyval.TypeVal).S.makeComposite((yyvsp[(4) - (5)].TypeVal).S); + (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(ArrayType::get((yyvsp[(4) - (5)].TypeVal).PAT->get(), + (unsigned)(yyvsp[(2) - (5)].UInt64Val)), (yyval.TypeVal).S)); + delete (yyvsp[(4) - (5)].TypeVal).PAT; + ;} + break; + + case 133: +#line 2080 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Vector type? + const llvm::Type* ElemTy = (yyvsp[(4) - (5)].TypeVal).PAT->get(); + if ((unsigned)(yyvsp[(2) - (5)].UInt64Val) != (yyvsp[(2) - (5)].UInt64Val)) error("Unsigned result not equal to signed result"); if (!(ElemTy->isInteger() || ElemTy->isFloatingPoint())) error("Elements of a VectorType must be integer or floating point"); - if (!isPowerOf2_32(yyvsp[-3].UInt64Val)) + if (!isPowerOf2_32((yyvsp[(2) - (5)].UInt64Val))) error("VectorType length should be a power of 2"); - yyval.TypeVal.S.makeComposite(yyvsp[-1].TypeVal.S); - yyval.TypeVal.PAT = new PATypeHolder(HandleUpRefs(VectorType::get(ElemTy, - (unsigned)yyvsp[-3].UInt64Val), yyval.TypeVal.S)); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 133: -#line 2167 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Structure type? + (yyval.TypeVal).S.makeComposite((yyvsp[(4) - (5)].TypeVal).S); + (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(VectorType::get(ElemTy, + (unsigned)(yyvsp[(2) - (5)].UInt64Val)), (yyval.TypeVal).S)); + delete (yyvsp[(4) - (5)].TypeVal).PAT; + ;} + break; + + case 134: +#line 2093 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Structure type? std::vector Elements; - yyval.TypeVal.S.makeComposite(); - for (std::list::iterator I = yyvsp[-1].TypeList->begin(), - E = yyvsp[-1].TypeList->end(); I != E; ++I) { + (yyval.TypeVal).S.makeComposite(); + for (std::list::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(), + E = (yyvsp[(2) - (3)].TypeList)->end(); I != E; ++I) { Elements.push_back(I->PAT->get()); - yyval.TypeVal.S.add(I->S); + (yyval.TypeVal).S.add(I->S); } - yyval.TypeVal.PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements), yyval.TypeVal.S)); - delete yyvsp[-1].TypeList; - ; - break;} -case 134: -#line 2178 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Empty structure type? - yyval.TypeVal.PAT = new PATypeHolder(StructType::get(std::vector())); - yyval.TypeVal.S.makeComposite(); - ; - break;} -case 135: -#line 2182 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Packed Structure type? - yyval.TypeVal.S.makeComposite(); + (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements), (yyval.TypeVal).S)); + delete (yyvsp[(2) - (3)].TypeList); + ;} + break; + + case 135: +#line 2104 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Empty structure type? + (yyval.TypeVal).PAT = new PATypeHolder(StructType::get(std::vector())); + (yyval.TypeVal).S.makeComposite(); + ;} + break; + + case 136: +#line 2108 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Packed Structure type? + (yyval.TypeVal).S.makeComposite(); std::vector Elements; - for (std::list::iterator I = yyvsp[-2].TypeList->begin(), - E = yyvsp[-2].TypeList->end(); I != E; ++I) { + for (std::list::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(), + E = (yyvsp[(3) - (5)].TypeList)->end(); I != E; ++I) { Elements.push_back(I->PAT->get()); - yyval.TypeVal.S.add(I->S); + (yyval.TypeVal).S.add(I->S); delete I->PAT; } - yyval.TypeVal.PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true), - yyval.TypeVal.S)); - delete yyvsp[-2].TypeList; - ; - break;} -case 136: -#line 2195 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Empty packed structure type? - yyval.TypeVal.PAT = new PATypeHolder(StructType::get(std::vector(),true)); - yyval.TypeVal.S.makeComposite(); - ; - break;} -case 137: -#line 2199 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Pointer type? - if (yyvsp[-1].TypeVal.PAT->get() == Type::LabelTy) + (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true), + (yyval.TypeVal).S)); + delete (yyvsp[(3) - (5)].TypeList); + ;} + break; + + case 137: +#line 2121 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Empty packed structure type? + (yyval.TypeVal).PAT = new PATypeHolder(StructType::get(std::vector(),true)); + (yyval.TypeVal).S.makeComposite(); + ;} + break; + + case 138: +#line 2125 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Pointer type? + if ((yyvsp[(1) - (2)].TypeVal).PAT->get() == Type::LabelTy) error("Cannot form a pointer to a basic block"); - yyval.TypeVal.S.makeComposite(yyvsp[-1].TypeVal.S); - yyval.TypeVal.PAT = new PATypeHolder(HandleUpRefs(PointerType::get(yyvsp[-1].TypeVal.PAT->get()), - yyval.TypeVal.S)); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 138: -#line 2213 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.TypeList = new std::list(); - yyval.TypeList->push_back(yyvsp[0].TypeVal); - ; - break;} -case 139: -#line 2217 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - (yyval.TypeList=yyvsp[-2].TypeList)->push_back(yyvsp[0].TypeVal); - ; - break;} -case 141: -#line 2225 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + (yyval.TypeVal).S.makeComposite((yyvsp[(1) - (2)].TypeVal).S); + (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(PointerType::get((yyvsp[(1) - (2)].TypeVal).PAT->get()), + (yyval.TypeVal).S)); + delete (yyvsp[(1) - (2)].TypeVal).PAT; + ;} + break; + + case 139: +#line 2139 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.TypeList) = new std::list(); + (yyval.TypeList)->push_back((yyvsp[(1) - (1)].TypeVal)); + ;} + break; + + case 140: +#line 2143 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back((yyvsp[(3) - (3)].TypeVal)); + ;} + break; + + case 142: +#line 2151 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { PATypeInfo VoidTI; VoidTI.PAT = new PATypeHolder(Type::VoidTy); VoidTI.S.makeSignless(); - (yyval.TypeList=yyvsp[-2].TypeList)->push_back(VoidTI); - ; - break;} -case 142: -#line 2231 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.TypeList = new std::list(); + ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(VoidTI); + ;} + break; + + case 143: +#line 2157 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.TypeList) = new std::list(); PATypeInfo VoidTI; VoidTI.PAT = new PATypeHolder(Type::VoidTy); VoidTI.S.makeSignless(); - yyval.TypeList->push_back(VoidTI); - ; - break;} -case 143: -#line 2238 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.TypeList = new std::list(); - ; - break;} -case 144: -#line 2250 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Nonempty unsized arr - const ArrayType *ATy = dyn_cast(yyvsp[-3].TypeVal.PAT->get()); + (yyval.TypeList)->push_back(VoidTI); + ;} + break; + + case 144: +#line 2164 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.TypeList) = new std::list(); + ;} + break; + + case 145: +#line 2176 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Nonempty unsized arr + const ArrayType *ATy = dyn_cast((yyvsp[(1) - (4)].TypeVal).PAT->get()); if (ATy == 0) error("Cannot make array constant with type: '" + - yyvsp[-3].TypeVal.PAT->get()->getDescription() + "'"); + (yyvsp[(1) - (4)].TypeVal).PAT->get()->getDescription() + "'"); const Type *ETy = ATy->getElementType(); int NumElements = ATy->getNumElements(); // Verify that we have the correct size... - if (NumElements != -1 && NumElements != (int)yyvsp[-1].ConstVector->size()) + if (NumElements != -1 && NumElements != (int)(yyvsp[(3) - (4)].ConstVector)->size()) error("Type mismatch: constant sized array initialized with " + - utostr(yyvsp[-1].ConstVector->size()) + " arguments, but has size of " + + utostr((yyvsp[(3) - (4)].ConstVector)->size()) + " arguments, but has size of " + itostr(NumElements) + ""); // Verify all elements are correct type! std::vector Elems; - for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) { - Constant *C = (*yyvsp[-1].ConstVector)[i].C; + for (unsigned i = 0; i < (yyvsp[(3) - (4)].ConstVector)->size(); i++) { + Constant *C = (*(yyvsp[(3) - (4)].ConstVector))[i].C; const Type* ValTy = C->getType(); if (ETy != ValTy) error("Element #" + utostr(i) + " is not of type '" + @@ -3805,72 +4685,75 @@ case 144: ValTy->getDescription() + "'"); Elems.push_back(C); } - yyval.ConstVal.C = ConstantArray::get(ATy, Elems); - yyval.ConstVal.S.copy(yyvsp[-3].TypeVal.S); - delete yyvsp[-3].TypeVal.PAT; - delete yyvsp[-1].ConstVector; - ; - break;} -case 145: -#line 2280 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const ArrayType *ATy = dyn_cast(yyvsp[-2].TypeVal.PAT->get()); + (yyval.ConstVal).C = ConstantArray::get(ATy, Elems); + (yyval.ConstVal).S.copy((yyvsp[(1) - (4)].TypeVal).S); + delete (yyvsp[(1) - (4)].TypeVal).PAT; + delete (yyvsp[(3) - (4)].ConstVector); + ;} + break; + + case 146: +#line 2206 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const ArrayType *ATy = dyn_cast((yyvsp[(1) - (3)].TypeVal).PAT->get()); if (ATy == 0) error("Cannot make array constant with type: '" + - yyvsp[-2].TypeVal.PAT->get()->getDescription() + "'"); + (yyvsp[(1) - (3)].TypeVal).PAT->get()->getDescription() + "'"); int NumElements = ATy->getNumElements(); if (NumElements != -1 && NumElements != 0) error("Type mismatch: constant sized array initialized with 0" " arguments, but has size of " + itostr(NumElements) +""); - yyval.ConstVal.C = ConstantArray::get(ATy, std::vector()); - yyval.ConstVal.S.copy(yyvsp[-2].TypeVal.S); - delete yyvsp[-2].TypeVal.PAT; - ; - break;} -case 146: -#line 2293 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const ArrayType *ATy = dyn_cast(yyvsp[-2].TypeVal.PAT->get()); + (yyval.ConstVal).C = ConstantArray::get(ATy, std::vector()); + (yyval.ConstVal).S.copy((yyvsp[(1) - (3)].TypeVal).S); + delete (yyvsp[(1) - (3)].TypeVal).PAT; + ;} + break; + + case 147: +#line 2219 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const ArrayType *ATy = dyn_cast((yyvsp[(1) - (3)].TypeVal).PAT->get()); if (ATy == 0) error("Cannot make array constant with type: '" + - yyvsp[-2].TypeVal.PAT->get()->getDescription() + "'"); + (yyvsp[(1) - (3)].TypeVal).PAT->get()->getDescription() + "'"); int NumElements = ATy->getNumElements(); const Type *ETy = dyn_cast(ATy->getElementType()); if (!ETy || cast(ETy)->getBitWidth() != 8) error("String arrays require type i8, not '" + ETy->getDescription() + "'"); - char *EndStr = UnEscapeLexed(yyvsp[0].StrVal, true); - if (NumElements != -1 && NumElements != (EndStr-yyvsp[0].StrVal)) + char *EndStr = UnEscapeLexed((yyvsp[(3) - (3)].StrVal), true); + if (NumElements != -1 && NumElements != (EndStr-(yyvsp[(3) - (3)].StrVal))) error("Can't build string constant of size " + - itostr((int)(EndStr-yyvsp[0].StrVal)) + " when array has size " + + itostr((int)(EndStr-(yyvsp[(3) - (3)].StrVal))) + " when array has size " + itostr(NumElements) + ""); std::vector Vals; - for (char *C = (char *)yyvsp[0].StrVal; C != (char *)EndStr; ++C) + for (char *C = (char *)(yyvsp[(3) - (3)].StrVal); C != (char *)EndStr; ++C) Vals.push_back(ConstantInt::get(ETy, *C)); - free(yyvsp[0].StrVal); - yyval.ConstVal.C = ConstantArray::get(ATy, Vals); - yyval.ConstVal.S.copy(yyvsp[-2].TypeVal.S); - delete yyvsp[-2].TypeVal.PAT; - ; - break;} -case 147: -#line 2316 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Nonempty unsized arr - const VectorType *PTy = dyn_cast(yyvsp[-3].TypeVal.PAT->get()); + free((yyvsp[(3) - (3)].StrVal)); + (yyval.ConstVal).C = ConstantArray::get(ATy, Vals); + (yyval.ConstVal).S.copy((yyvsp[(1) - (3)].TypeVal).S); + delete (yyvsp[(1) - (3)].TypeVal).PAT; + ;} + break; + + case 148: +#line 2242 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Nonempty unsized arr + const VectorType *PTy = dyn_cast((yyvsp[(1) - (4)].TypeVal).PAT->get()); if (PTy == 0) error("Cannot make packed constant with type: '" + - yyvsp[-3].TypeVal.PAT->get()->getDescription() + "'"); + (yyvsp[(1) - (4)].TypeVal).PAT->get()->getDescription() + "'"); const Type *ETy = PTy->getElementType(); int NumElements = PTy->getNumElements(); // Verify that we have the correct size... - if (NumElements != -1 && NumElements != (int)yyvsp[-1].ConstVector->size()) + if (NumElements != -1 && NumElements != (int)(yyvsp[(3) - (4)].ConstVector)->size()) error("Type mismatch: constant sized packed initialized with " + - utostr(yyvsp[-1].ConstVector->size()) + " arguments, but has size of " + + utostr((yyvsp[(3) - (4)].ConstVector)->size()) + " arguments, but has size of " + itostr(NumElements) + ""); // Verify all elements are correct type! std::vector Elems; - for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) { - Constant *C = (*yyvsp[-1].ConstVector)[i].C; + for (unsigned i = 0; i < (yyvsp[(3) - (4)].ConstVector)->size(); i++) { + Constant *C = (*(yyvsp[(3) - (4)].ConstVector))[i].C; const Type* ValTy = C->getType(); if (ETy != ValTy) error("Element #" + utostr(i) + " is not of type '" + @@ -3878,117 +4761,124 @@ case 147: ValTy->getDescription() + "'"); Elems.push_back(C); } - yyval.ConstVal.C = ConstantVector::get(PTy, Elems); - yyval.ConstVal.S.copy(yyvsp[-3].TypeVal.S); - delete yyvsp[-3].TypeVal.PAT; - delete yyvsp[-1].ConstVector; - ; - break;} -case 148: -#line 2344 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const StructType *STy = dyn_cast(yyvsp[-3].TypeVal.PAT->get()); + (yyval.ConstVal).C = ConstantVector::get(PTy, Elems); + (yyval.ConstVal).S.copy((yyvsp[(1) - (4)].TypeVal).S); + delete (yyvsp[(1) - (4)].TypeVal).PAT; + delete (yyvsp[(3) - (4)].ConstVector); + ;} + break; + + case 149: +#line 2270 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const StructType *STy = dyn_cast((yyvsp[(1) - (4)].TypeVal).PAT->get()); if (STy == 0) error("Cannot make struct constant with type: '" + - yyvsp[-3].TypeVal.PAT->get()->getDescription() + "'"); - if (yyvsp[-1].ConstVector->size() != STy->getNumContainedTypes()) + (yyvsp[(1) - (4)].TypeVal).PAT->get()->getDescription() + "'"); + if ((yyvsp[(3) - (4)].ConstVector)->size() != STy->getNumContainedTypes()) error("Illegal number of initializers for structure type"); // Check to ensure that constants are compatible with the type initializer! std::vector Fields; - for (unsigned i = 0, e = yyvsp[-1].ConstVector->size(); i != e; ++i) { - Constant *C = (*yyvsp[-1].ConstVector)[i].C; + for (unsigned i = 0, e = (yyvsp[(3) - (4)].ConstVector)->size(); i != e; ++i) { + Constant *C = (*(yyvsp[(3) - (4)].ConstVector))[i].C; if (C->getType() != STy->getElementType(i)) error("Expected type '" + STy->getElementType(i)->getDescription() + "' for element #" + utostr(i) + " of structure initializer"); Fields.push_back(C); } - yyval.ConstVal.C = ConstantStruct::get(STy, Fields); - yyval.ConstVal.S.copy(yyvsp[-3].TypeVal.S); - delete yyvsp[-3].TypeVal.PAT; - delete yyvsp[-1].ConstVector; - ; - break;} -case 149: -#line 2366 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const StructType *STy = dyn_cast(yyvsp[-2].TypeVal.PAT->get()); + (yyval.ConstVal).C = ConstantStruct::get(STy, Fields); + (yyval.ConstVal).S.copy((yyvsp[(1) - (4)].TypeVal).S); + delete (yyvsp[(1) - (4)].TypeVal).PAT; + delete (yyvsp[(3) - (4)].ConstVector); + ;} + break; + + case 150: +#line 2292 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const StructType *STy = dyn_cast((yyvsp[(1) - (3)].TypeVal).PAT->get()); if (STy == 0) error("Cannot make struct constant with type: '" + - yyvsp[-2].TypeVal.PAT->get()->getDescription() + "'"); + (yyvsp[(1) - (3)].TypeVal).PAT->get()->getDescription() + "'"); if (STy->getNumContainedTypes() != 0) error("Illegal number of initializers for structure type"); - yyval.ConstVal.C = ConstantStruct::get(STy, std::vector()); - yyval.ConstVal.S.copy(yyvsp[-2].TypeVal.S); - delete yyvsp[-2].TypeVal.PAT; - ; - break;} -case 150: -#line 2377 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const StructType *STy = dyn_cast(yyvsp[-5].TypeVal.PAT->get()); + (yyval.ConstVal).C = ConstantStruct::get(STy, std::vector()); + (yyval.ConstVal).S.copy((yyvsp[(1) - (3)].TypeVal).S); + delete (yyvsp[(1) - (3)].TypeVal).PAT; + ;} + break; + + case 151: +#line 2303 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const StructType *STy = dyn_cast((yyvsp[(1) - (6)].TypeVal).PAT->get()); if (STy == 0) error("Cannot make packed struct constant with type: '" + - yyvsp[-5].TypeVal.PAT->get()->getDescription() + "'"); - if (yyvsp[-2].ConstVector->size() != STy->getNumContainedTypes()) + (yyvsp[(1) - (6)].TypeVal).PAT->get()->getDescription() + "'"); + if ((yyvsp[(4) - (6)].ConstVector)->size() != STy->getNumContainedTypes()) error("Illegal number of initializers for packed structure type"); // Check to ensure that constants are compatible with the type initializer! std::vector Fields; - for (unsigned i = 0, e = yyvsp[-2].ConstVector->size(); i != e; ++i) { - Constant *C = (*yyvsp[-2].ConstVector)[i].C; + for (unsigned i = 0, e = (yyvsp[(4) - (6)].ConstVector)->size(); i != e; ++i) { + Constant *C = (*(yyvsp[(4) - (6)].ConstVector))[i].C; if (C->getType() != STy->getElementType(i)) error("Expected type '" + STy->getElementType(i)->getDescription() + "' for element #" + utostr(i) + " of packed struct initializer"); Fields.push_back(C); } - yyval.ConstVal.C = ConstantStruct::get(STy, Fields); - yyval.ConstVal.S.copy(yyvsp[-5].TypeVal.S); - delete yyvsp[-5].TypeVal.PAT; - delete yyvsp[-2].ConstVector; - ; - break;} -case 151: -#line 2399 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const StructType *STy = dyn_cast(yyvsp[-4].TypeVal.PAT->get()); + (yyval.ConstVal).C = ConstantStruct::get(STy, Fields); + (yyval.ConstVal).S.copy((yyvsp[(1) - (6)].TypeVal).S); + delete (yyvsp[(1) - (6)].TypeVal).PAT; + delete (yyvsp[(4) - (6)].ConstVector); + ;} + break; + + case 152: +#line 2325 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const StructType *STy = dyn_cast((yyvsp[(1) - (5)].TypeVal).PAT->get()); if (STy == 0) error("Cannot make packed struct constant with type: '" + - yyvsp[-4].TypeVal.PAT->get()->getDescription() + "'"); + (yyvsp[(1) - (5)].TypeVal).PAT->get()->getDescription() + "'"); if (STy->getNumContainedTypes() != 0) error("Illegal number of initializers for packed structure type"); - yyval.ConstVal.C = ConstantStruct::get(STy, std::vector()); - yyval.ConstVal.S.copy(yyvsp[-4].TypeVal.S); - delete yyvsp[-4].TypeVal.PAT; - ; - break;} -case 152: -#line 2410 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const PointerType *PTy = dyn_cast(yyvsp[-1].TypeVal.PAT->get()); + (yyval.ConstVal).C = ConstantStruct::get(STy, std::vector()); + (yyval.ConstVal).S.copy((yyvsp[(1) - (5)].TypeVal).S); + delete (yyvsp[(1) - (5)].TypeVal).PAT; + ;} + break; + + case 153: +#line 2336 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const PointerType *PTy = dyn_cast((yyvsp[(1) - (2)].TypeVal).PAT->get()); if (PTy == 0) error("Cannot make null pointer constant with type: '" + - yyvsp[-1].TypeVal.PAT->get()->getDescription() + "'"); - yyval.ConstVal.C = ConstantPointerNull::get(PTy); - yyval.ConstVal.S.copy(yyvsp[-1].TypeVal.S); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 153: -#line 2419 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ConstVal.C = UndefValue::get(yyvsp[-1].TypeVal.PAT->get()); - yyval.ConstVal.S.copy(yyvsp[-1].TypeVal.S); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 154: -#line 2424 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const PointerType *Ty = dyn_cast(yyvsp[-1].TypeVal.PAT->get()); + (yyvsp[(1) - (2)].TypeVal).PAT->get()->getDescription() + "'"); + (yyval.ConstVal).C = ConstantPointerNull::get(PTy); + (yyval.ConstVal).S.copy((yyvsp[(1) - (2)].TypeVal).S); + delete (yyvsp[(1) - (2)].TypeVal).PAT; + ;} + break; + + case 154: +#line 2345 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ConstVal).C = UndefValue::get((yyvsp[(1) - (2)].TypeVal).PAT->get()); + (yyval.ConstVal).S.copy((yyvsp[(1) - (2)].TypeVal).S); + delete (yyvsp[(1) - (2)].TypeVal).PAT; + ;} + break; + + case 155: +#line 2350 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const PointerType *Ty = dyn_cast((yyvsp[(1) - (2)].TypeVal).PAT->get()); if (Ty == 0) error("Global const reference must be a pointer type, not" + - yyvsp[-1].TypeVal.PAT->get()->getDescription()); + (yyvsp[(1) - (2)].TypeVal).PAT->get()->getDescription()); // ConstExprs can exist in the body of a function, thus creating // GlobalValues whenever they refer to a variable. Because we are in @@ -3999,8 +4889,8 @@ case 154: // Function *SavedCurFn = CurFun.CurrentFunction; CurFun.CurrentFunction = 0; - yyvsp[0].ValIDVal.S.copy(yyvsp[-1].TypeVal.S); - Value *V = getExistingValue(Ty, yyvsp[0].ValIDVal); + (yyvsp[(2) - (2)].ValIDVal).S.copy((yyvsp[(1) - (2)].TypeVal).S); + Value *V = getExistingValue(Ty, (yyvsp[(2) - (2)].ValIDVal)); CurFun.CurrentFunction = SavedCurFn; // If this is an initializer for a constant pointer, which is referencing a @@ -4013,14 +4903,14 @@ case 154: // First check to see if the forward references value is already created! PerModuleInfo::GlobalRefsType::iterator I = - CurModule.GlobalRefs.find(std::make_pair(PT, yyvsp[0].ValIDVal)); + CurModule.GlobalRefs.find(std::make_pair(PT, (yyvsp[(2) - (2)].ValIDVal))); if (I != CurModule.GlobalRefs.end()) { V = I->second; // Placeholder already exists, use it... - yyvsp[0].ValIDVal.destroy(); + (yyvsp[(2) - (2)].ValIDVal).destroy(); } else { std::string Name; - if (yyvsp[0].ValIDVal.Type == ValID::NameVal) Name = yyvsp[0].ValIDVal.Name; + if ((yyvsp[(2) - (2)].ValIDVal).Type == ValID::NameVal) Name = (yyvsp[(2) - (2)].ValIDVal).Name; // Create the forward referenced global. GlobalValue *GV; @@ -4035,145 +4925,156 @@ case 154: } // Keep track of the fact that we have a forward ref to recycle it - CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, yyvsp[0].ValIDVal), GV)); + CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, (yyvsp[(2) - (2)].ValIDVal)), GV)); V = GV; } } - yyval.ConstVal.C = cast(V); - yyval.ConstVal.S.copy(yyvsp[-1].TypeVal.S); - delete yyvsp[-1].TypeVal.PAT; // Free the type handle - ; - break;} -case 155: -#line 2483 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[-1].TypeVal.PAT->get() != yyvsp[0].ConstVal.C->getType()) + (yyval.ConstVal).C = cast(V); + (yyval.ConstVal).S.copy((yyvsp[(1) - (2)].TypeVal).S); + delete (yyvsp[(1) - (2)].TypeVal).PAT; // Free the type handle + ;} + break; + + case 156: +#line 2409 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(1) - (2)].TypeVal).PAT->get() != (yyvsp[(2) - (2)].ConstVal).C->getType()) error("Mismatched types for constant expression"); - yyval.ConstVal = yyvsp[0].ConstVal; - yyval.ConstVal.S.copy(yyvsp[-1].TypeVal.S); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 156: -#line 2490 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[-1].TypeVal.PAT->get(); + (yyval.ConstVal) = (yyvsp[(2) - (2)].ConstVal); + (yyval.ConstVal).S.copy((yyvsp[(1) - (2)].TypeVal).S); + delete (yyvsp[(1) - (2)].TypeVal).PAT; + ;} + break; + + case 157: +#line 2416 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(1) - (2)].TypeVal).PAT->get(); if (isa(Ty) || Ty == Type::LabelTy || isa(Ty)) error("Cannot create a null initialized value of this type"); - yyval.ConstVal.C = Constant::getNullValue(Ty); - yyval.ConstVal.S.copy(yyvsp[-1].TypeVal.S); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 157: -#line 2498 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // integral constants - const Type *Ty = yyvsp[-1].PrimType.T; - if (!ConstantInt::isValueValidForType(Ty, yyvsp[0].SInt64Val)) + (yyval.ConstVal).C = Constant::getNullValue(Ty); + (yyval.ConstVal).S.copy((yyvsp[(1) - (2)].TypeVal).S); + delete (yyvsp[(1) - (2)].TypeVal).PAT; + ;} + break; + + case 158: +#line 2424 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // integral constants + const Type *Ty = (yyvsp[(1) - (2)].PrimType).T; + if (!ConstantInt::isValueValidForType(Ty, (yyvsp[(2) - (2)].SInt64Val))) error("Constant value doesn't fit in type"); - yyval.ConstVal.C = ConstantInt::get(Ty, yyvsp[0].SInt64Val); - yyval.ConstVal.S.makeSigned(); - ; - break;} -case 158: -#line 2505 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // integral constants - const Type *Ty = yyvsp[-1].PrimType.T; - if (!ConstantInt::isValueValidForType(Ty, yyvsp[0].UInt64Val)) + (yyval.ConstVal).C = ConstantInt::get(Ty, (yyvsp[(2) - (2)].SInt64Val)); + (yyval.ConstVal).S.makeSigned(); + ;} + break; + + case 159: +#line 2431 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // integral constants + const Type *Ty = (yyvsp[(1) - (2)].PrimType).T; + if (!ConstantInt::isValueValidForType(Ty, (yyvsp[(2) - (2)].UInt64Val))) error("Constant value doesn't fit in type"); - yyval.ConstVal.C = ConstantInt::get(Ty, yyvsp[0].UInt64Val); - yyval.ConstVal.S.makeUnsigned(); - ; - break;} -case 159: -#line 2512 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Boolean constants - yyval.ConstVal.C = ConstantInt::get(Type::Int1Ty, true); - yyval.ConstVal.S.makeUnsigned(); - ; - break;} -case 160: -#line 2516 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Boolean constants - yyval.ConstVal.C = ConstantInt::get(Type::Int1Ty, false); - yyval.ConstVal.S.makeUnsigned(); - ; - break;} -case 161: -#line 2520 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Float & Double constants - if (!ConstantFP::isValueValidForType(yyvsp[-1].PrimType.T, *yyvsp[0].FPVal)) + (yyval.ConstVal).C = ConstantInt::get(Ty, (yyvsp[(2) - (2)].UInt64Val)); + (yyval.ConstVal).S.makeUnsigned(); + ;} + break; + + case 160: +#line 2438 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Boolean constants + (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, true); + (yyval.ConstVal).S.makeUnsigned(); + ;} + break; + + case 161: +#line 2442 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Boolean constants + (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, false); + (yyval.ConstVal).S.makeUnsigned(); + ;} + break; + + case 162: +#line 2446 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Float & Double constants + if (!ConstantFP::isValueValidForType((yyvsp[(1) - (2)].PrimType).T, *(yyvsp[(2) - (2)].FPVal))) error("Floating point constant invalid for type"); // Lexer has no type info, so builds all FP constants as double. // Fix this here. - if (yyvsp[-1].PrimType.T==Type::FloatTy) - yyvsp[0].FPVal->convert(APFloat::IEEEsingle, APFloat::rmNearestTiesToEven); - yyval.ConstVal.C = ConstantFP::get(yyvsp[-1].PrimType.T, *yyvsp[0].FPVal); - delete yyvsp[0].FPVal; - yyval.ConstVal.S.makeSignless(); - ; - break;} -case 162: -#line 2534 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type* SrcTy = yyvsp[-3].ConstVal.C->getType(); - const Type* DstTy = yyvsp[-1].TypeVal.PAT->get(); - Signedness SrcSign(yyvsp[-3].ConstVal.S); - Signedness DstSign(yyvsp[-1].TypeVal.S); + if ((yyvsp[(1) - (2)].PrimType).T==Type::FloatTy) + (yyvsp[(2) - (2)].FPVal)->convert(APFloat::IEEEsingle, APFloat::rmNearestTiesToEven); + (yyval.ConstVal).C = ConstantFP::get((yyvsp[(1) - (2)].PrimType).T, *(yyvsp[(2) - (2)].FPVal)); + delete (yyvsp[(2) - (2)].FPVal); + (yyval.ConstVal).S.makeSignless(); + ;} + break; + + case 163: +#line 2460 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type* SrcTy = (yyvsp[(3) - (6)].ConstVal).C->getType(); + const Type* DstTy = (yyvsp[(5) - (6)].TypeVal).PAT->get(); + Signedness SrcSign((yyvsp[(3) - (6)].ConstVal).S); + Signedness DstSign((yyvsp[(5) - (6)].TypeVal).S); if (!SrcTy->isFirstClassType()) error("cast constant expression from a non-primitive type: '" + SrcTy->getDescription() + "'"); if (!DstTy->isFirstClassType()) error("cast constant expression to a non-primitive type: '" + DstTy->getDescription() + "'"); - yyval.ConstVal.C = cast(getCast(yyvsp[-5].CastOpVal, yyvsp[-3].ConstVal.C, SrcSign, DstTy, DstSign)); - yyval.ConstVal.S.copy(DstSign); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 163: -#line 2549 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[-2].ConstVal.C->getType(); + (yyval.ConstVal).C = cast(getCast((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal).C, SrcSign, DstTy, DstSign)); + (yyval.ConstVal).S.copy(DstSign); + delete (yyvsp[(5) - (6)].TypeVal).PAT; + ;} + break; + + case 164: +#line 2475 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(3) - (5)].ConstVal).C->getType(); if (!isa(Ty)) error("GetElementPtr requires a pointer operand"); std::vector CIndices; - upgradeGEPCEIndices(yyvsp[-2].ConstVal.C->getType(), yyvsp[-1].ValueList, CIndices); - - delete yyvsp[-1].ValueList; - yyval.ConstVal.C = ConstantExpr::getGetElementPtr(yyvsp[-2].ConstVal.C, &CIndices[0], CIndices.size()); - yyval.ConstVal.S.copy(getElementSign(yyvsp[-2].ConstVal, CIndices)); - ; - break;} -case 164: -#line 2561 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!yyvsp[-5].ConstVal.C->getType()->isInteger() || - cast(yyvsp[-5].ConstVal.C->getType())->getBitWidth() != 1) + upgradeGEPCEIndices((yyvsp[(3) - (5)].ConstVal).C->getType(), (yyvsp[(4) - (5)].ValueList), CIndices); + + delete (yyvsp[(4) - (5)].ValueList); + (yyval.ConstVal).C = ConstantExpr::getGetElementPtr((yyvsp[(3) - (5)].ConstVal).C, &CIndices[0], CIndices.size()); + (yyval.ConstVal).S.copy(getElementSign((yyvsp[(3) - (5)].ConstVal), CIndices)); + ;} + break; + + case 165: +#line 2487 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!(yyvsp[(3) - (8)].ConstVal).C->getType()->isInteger() || + cast((yyvsp[(3) - (8)].ConstVal).C->getType())->getBitWidth() != 1) error("Select condition must be bool type"); - if (yyvsp[-3].ConstVal.C->getType() != yyvsp[-1].ConstVal.C->getType()) + if ((yyvsp[(5) - (8)].ConstVal).C->getType() != (yyvsp[(7) - (8)].ConstVal).C->getType()) error("Select operand types must match"); - yyval.ConstVal.C = ConstantExpr::getSelect(yyvsp[-5].ConstVal.C, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C); - yyval.ConstVal.S.copy(yyvsp[-3].ConstVal.S); - ; - break;} -case 165: -#line 2570 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[-3].ConstVal.C->getType(); - if (Ty != yyvsp[-1].ConstVal.C->getType()) + (yyval.ConstVal).C = ConstantExpr::getSelect((yyvsp[(3) - (8)].ConstVal).C, (yyvsp[(5) - (8)].ConstVal).C, (yyvsp[(7) - (8)].ConstVal).C); + (yyval.ConstVal).S.copy((yyvsp[(5) - (8)].ConstVal).S); + ;} + break; + + case 166: +#line 2496 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(3) - (6)].ConstVal).C->getType(); + if (Ty != (yyvsp[(5) - (6)].ConstVal).C->getType()) error("Binary operator types must match"); // First, make sure we're dealing with the right opcode by upgrading from // obsolete versions. - Instruction::BinaryOps Opcode = getBinaryOp(yyvsp[-5].BinaryOpVal, Ty, yyvsp[-3].ConstVal.S); + Instruction::BinaryOps Opcode = getBinaryOp((yyvsp[(1) - (6)].BinaryOpVal), Ty, (yyvsp[(3) - (6)].ConstVal).S); // HACK: llvm 1.3 and earlier used to emit invalid pointer constant exprs. // To retain backward compatibility with these early compilers, we emit a // cast to the appropriate integer type automatically if we are in the // broken case. See PR424 for more information. if (!isa(Ty)) { - yyval.ConstVal.C = ConstantExpr::get(Opcode, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C); + (yyval.ConstVal).C = ConstantExpr::get(Opcode, (yyvsp[(3) - (6)].ConstVal).C, (yyvsp[(5) - (6)].ConstVal).C); } else { const Type *IntPtrTy = 0; switch (CurModule.CurrentModule->getPointerSize()) { @@ -4181,147 +5082,165 @@ case 165: case Module::Pointer64: IntPtrTy = Type::Int64Ty; break; default: error("invalid pointer binary constant expr"); } - yyval.ConstVal.C = ConstantExpr::get(Opcode, - ConstantExpr::getCast(Instruction::PtrToInt, yyvsp[-3].ConstVal.C, IntPtrTy), - ConstantExpr::getCast(Instruction::PtrToInt, yyvsp[-1].ConstVal.C, IntPtrTy)); - yyval.ConstVal.C = ConstantExpr::getCast(Instruction::IntToPtr, yyval.ConstVal.C, Ty); + (yyval.ConstVal).C = ConstantExpr::get(Opcode, + ConstantExpr::getCast(Instruction::PtrToInt, (yyvsp[(3) - (6)].ConstVal).C, IntPtrTy), + ConstantExpr::getCast(Instruction::PtrToInt, (yyvsp[(5) - (6)].ConstVal).C, IntPtrTy)); + (yyval.ConstVal).C = ConstantExpr::getCast(Instruction::IntToPtr, (yyval.ConstVal).C, Ty); } - yyval.ConstVal.S.copy(yyvsp[-3].ConstVal.S); - ; - break;} -case 166: -#line 2598 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type* Ty = yyvsp[-3].ConstVal.C->getType(); - if (Ty != yyvsp[-1].ConstVal.C->getType()) + (yyval.ConstVal).S.copy((yyvsp[(3) - (6)].ConstVal).S); + ;} + break; + + case 167: +#line 2524 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type* Ty = (yyvsp[(3) - (6)].ConstVal).C->getType(); + if (Ty != (yyvsp[(5) - (6)].ConstVal).C->getType()) error("Logical operator types must match"); if (!Ty->isInteger()) { if (!isa(Ty) || !cast(Ty)->getElementType()->isInteger()) error("Logical operator requires integer operands"); } - Instruction::BinaryOps Opcode = getBinaryOp(yyvsp[-5].BinaryOpVal, Ty, yyvsp[-3].ConstVal.S); - yyval.ConstVal.C = ConstantExpr::get(Opcode, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C); - yyval.ConstVal.S.copy(yyvsp[-3].ConstVal.S); - ; - break;} -case 167: -#line 2611 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type* Ty = yyvsp[-3].ConstVal.C->getType(); - if (Ty != yyvsp[-1].ConstVal.C->getType()) + Instruction::BinaryOps Opcode = getBinaryOp((yyvsp[(1) - (6)].BinaryOpVal), Ty, (yyvsp[(3) - (6)].ConstVal).S); + (yyval.ConstVal).C = ConstantExpr::get(Opcode, (yyvsp[(3) - (6)].ConstVal).C, (yyvsp[(5) - (6)].ConstVal).C); + (yyval.ConstVal).S.copy((yyvsp[(3) - (6)].ConstVal).S); + ;} + break; + + case 168: +#line 2537 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type* Ty = (yyvsp[(3) - (6)].ConstVal).C->getType(); + if (Ty != (yyvsp[(5) - (6)].ConstVal).C->getType()) error("setcc operand types must match"); unsigned short pred; - Instruction::OtherOps Opcode = getCompareOp(yyvsp[-5].BinaryOpVal, pred, Ty, yyvsp[-3].ConstVal.S); - yyval.ConstVal.C = ConstantExpr::getCompare(Opcode, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C); - yyval.ConstVal.S.makeUnsigned(); - ; - break;} -case 168: -#line 2620 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[-3].ConstVal.C->getType() != yyvsp[-1].ConstVal.C->getType()) + Instruction::OtherOps Opcode = getCompareOp((yyvsp[(1) - (6)].BinaryOpVal), pred, Ty, (yyvsp[(3) - (6)].ConstVal).S); + (yyval.ConstVal).C = ConstantExpr::getCompare(Opcode, (yyvsp[(3) - (6)].ConstVal).C, (yyvsp[(5) - (6)].ConstVal).C); + (yyval.ConstVal).S.makeUnsigned(); + ;} + break; + + case 169: +#line 2546 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(4) - (7)].ConstVal).C->getType() != (yyvsp[(6) - (7)].ConstVal).C->getType()) error("icmp operand types must match"); - yyval.ConstVal.C = ConstantExpr::getCompare(yyvsp[-5].IPred, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C); - yyval.ConstVal.S.makeUnsigned(); - ; - break;} -case 169: -#line 2626 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[-3].ConstVal.C->getType() != yyvsp[-1].ConstVal.C->getType()) + (yyval.ConstVal).C = ConstantExpr::getCompare((yyvsp[(2) - (7)].IPred), (yyvsp[(4) - (7)].ConstVal).C, (yyvsp[(6) - (7)].ConstVal).C); + (yyval.ConstVal).S.makeUnsigned(); + ;} + break; + + case 170: +#line 2552 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(4) - (7)].ConstVal).C->getType() != (yyvsp[(6) - (7)].ConstVal).C->getType()) error("fcmp operand types must match"); - yyval.ConstVal.C = ConstantExpr::getCompare(yyvsp[-5].FPred, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C); - yyval.ConstVal.S.makeUnsigned(); - ; - break;} -case 170: -#line 2632 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!yyvsp[-1].ConstVal.C->getType()->isInteger() || - cast(yyvsp[-1].ConstVal.C->getType())->getBitWidth() != 8) + (yyval.ConstVal).C = ConstantExpr::getCompare((yyvsp[(2) - (7)].FPred), (yyvsp[(4) - (7)].ConstVal).C, (yyvsp[(6) - (7)].ConstVal).C); + (yyval.ConstVal).S.makeUnsigned(); + ;} + break; + + case 171: +#line 2558 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!(yyvsp[(5) - (6)].ConstVal).C->getType()->isInteger() || + cast((yyvsp[(5) - (6)].ConstVal).C->getType())->getBitWidth() != 8) error("Shift count for shift constant must be unsigned byte"); - const Type* Ty = yyvsp[-3].ConstVal.C->getType(); - if (!yyvsp[-3].ConstVal.C->getType()->isInteger()) + const Type* Ty = (yyvsp[(3) - (6)].ConstVal).C->getType(); + if (!(yyvsp[(3) - (6)].ConstVal).C->getType()->isInteger()) error("Shift constant expression requires integer operand"); - Constant *ShiftAmt = ConstantExpr::getZExt(yyvsp[-1].ConstVal.C, Ty); - yyval.ConstVal.C = ConstantExpr::get(getBinaryOp(yyvsp[-5].BinaryOpVal, Ty, yyvsp[-3].ConstVal.S), yyvsp[-3].ConstVal.C, ShiftAmt); - yyval.ConstVal.S.copy(yyvsp[-3].ConstVal.S); - ; - break;} -case 171: -#line 2643 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!ExtractElementInst::isValidOperands(yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C)) + Constant *ShiftAmt = ConstantExpr::getZExt((yyvsp[(5) - (6)].ConstVal).C, Ty); + (yyval.ConstVal).C = ConstantExpr::get(getBinaryOp((yyvsp[(1) - (6)].BinaryOpVal), Ty, (yyvsp[(3) - (6)].ConstVal).S), (yyvsp[(3) - (6)].ConstVal).C, ShiftAmt); + (yyval.ConstVal).S.copy((yyvsp[(3) - (6)].ConstVal).S); + ;} + break; + + case 172: +#line 2569 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal).C, (yyvsp[(5) - (6)].ConstVal).C)) error("Invalid extractelement operands"); - yyval.ConstVal.C = ConstantExpr::getExtractElement(yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C); - yyval.ConstVal.S.copy(yyvsp[-3].ConstVal.S.get(0)); - ; - break;} -case 172: -#line 2649 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!InsertElementInst::isValidOperands(yyvsp[-5].ConstVal.C, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C)) + (yyval.ConstVal).C = ConstantExpr::getExtractElement((yyvsp[(3) - (6)].ConstVal).C, (yyvsp[(5) - (6)].ConstVal).C); + (yyval.ConstVal).S.copy((yyvsp[(3) - (6)].ConstVal).S.get(0)); + ;} + break; + + case 173: +#line 2575 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!InsertElementInst::isValidOperands((yyvsp[(3) - (8)].ConstVal).C, (yyvsp[(5) - (8)].ConstVal).C, (yyvsp[(7) - (8)].ConstVal).C)) error("Invalid insertelement operands"); - yyval.ConstVal.C = ConstantExpr::getInsertElement(yyvsp[-5].ConstVal.C, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C); - yyval.ConstVal.S.copy(yyvsp[-5].ConstVal.S); - ; - break;} -case 173: -#line 2655 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!ShuffleVectorInst::isValidOperands(yyvsp[-5].ConstVal.C, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C)) + (yyval.ConstVal).C = ConstantExpr::getInsertElement((yyvsp[(3) - (8)].ConstVal).C, (yyvsp[(5) - (8)].ConstVal).C, (yyvsp[(7) - (8)].ConstVal).C); + (yyval.ConstVal).S.copy((yyvsp[(3) - (8)].ConstVal).S); + ;} + break; + + case 174: +#line 2581 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!ShuffleVectorInst::isValidOperands((yyvsp[(3) - (8)].ConstVal).C, (yyvsp[(5) - (8)].ConstVal).C, (yyvsp[(7) - (8)].ConstVal).C)) error("Invalid shufflevector operands"); - yyval.ConstVal.C = ConstantExpr::getShuffleVector(yyvsp[-5].ConstVal.C, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C); - yyval.ConstVal.S.copy(yyvsp[-5].ConstVal.S); - ; - break;} -case 174: -#line 2666 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ (yyval.ConstVector = yyvsp[-2].ConstVector)->push_back(yyvsp[0].ConstVal); ; - break;} -case 175: -#line 2667 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ConstVector = new std::vector(); - yyval.ConstVector->push_back(yyvsp[0].ConstVal); - ; - break;} -case 176: -#line 2676 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.BoolVal = false; ; - break;} -case 177: -#line 2677 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.BoolVal = true; ; - break;} -case 178: -#line 2689 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ModuleVal = ParserResult = yyvsp[0].ModuleVal; + (yyval.ConstVal).C = ConstantExpr::getShuffleVector((yyvsp[(3) - (8)].ConstVal).C, (yyvsp[(5) - (8)].ConstVal).C, (yyvsp[(7) - (8)].ConstVal).C); + (yyval.ConstVal).S.copy((yyvsp[(3) - (8)].ConstVal).S); + ;} + break; + + case 175: +#line 2592 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal)); ;} + break; + + case 176: +#line 2593 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ConstVector) = new std::vector(); + (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal)); + ;} + break; + + case 177: +#line 2602 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.BoolVal) = false; ;} + break; + + case 178: +#line 2603 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.BoolVal) = true; ;} + break; + + case 179: +#line 2615 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ModuleVal) = ParserResult = (yyvsp[(1) - (1)].ModuleVal); CurModule.ModuleDone(); - ; - break;} -case 179: -#line 2698 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ModuleVal = yyvsp[-1].ModuleVal; CurFun.FunctionDone(); ; - break;} -case 180: -#line 2699 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ModuleVal = yyvsp[-1].ModuleVal; ; - break;} -case 181: -#line 2700 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ModuleVal = yyvsp[-3].ModuleVal; ; - break;} -case 182: -#line 2701 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ModuleVal = yyvsp[-1].ModuleVal; ; - break;} -case 183: -#line 2702 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ModuleVal = CurModule.CurrentModule; + ;} + break; + + case 180: +#line 2624 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ModuleVal) = (yyvsp[(1) - (2)].ModuleVal); CurFun.FunctionDone(); ;} + break; + + case 181: +#line 2625 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ModuleVal) = (yyvsp[(1) - (2)].ModuleVal); ;} + break; + + case 182: +#line 2626 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ModuleVal) = (yyvsp[(1) - (4)].ModuleVal); ;} + break; + + case 183: +#line 2627 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ModuleVal) = (yyvsp[(1) - (2)].ModuleVal); ;} + break; + + case 184: +#line 2628 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ModuleVal) = CurModule.CurrentModule; // Emit an error if there are any unresolved types left. if (!CurModule.LateResolveTypes.empty()) { const ValID &DID = CurModule.LateResolveTypes.begin()->first; @@ -4331,11 +5250,12 @@ case 183: error("Reference to an undefined type: #" + itostr(DID.Num)); } } - ; - break;} -case 184: -#line 2718 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + ;} + break; + + case 185: +#line 2644 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Eagerly resolve types. This is not an optimization, this is a // requirement that is due to the fact that we could have this: // @@ -4345,243 +5265,275 @@ case 184: // If types are not resolved eagerly, then the two types will not be // determined to be the same type! // - ResolveTypeTo(yyvsp[-2].StrVal, yyvsp[0].TypeVal.PAT->get(), yyvsp[0].TypeVal.S); + ResolveTypeTo((yyvsp[(2) - (4)].StrVal), (yyvsp[(4) - (4)].TypeVal).PAT->get(), (yyvsp[(4) - (4)].TypeVal).S); - if (!setTypeName(yyvsp[0].TypeVal, yyvsp[-2].StrVal) && !yyvsp[-2].StrVal) { + if (!setTypeName((yyvsp[(4) - (4)].TypeVal), (yyvsp[(2) - (4)].StrVal)) && !(yyvsp[(2) - (4)].StrVal)) { // If this is a numbered type that is not a redefinition, add it to the // slot table. - CurModule.Types.push_back(yyvsp[0].TypeVal.PAT->get()); - CurModule.TypeSigns.push_back(yyvsp[0].TypeVal.S); + CurModule.Types.push_back((yyvsp[(4) - (4)].TypeVal).PAT->get()); + CurModule.TypeSigns.push_back((yyvsp[(4) - (4)].TypeVal).S); } - delete yyvsp[0].TypeVal.PAT; - ; - break;} -case 185: -#line 2738 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Function prototypes can be in const pool - ; - break;} -case 186: -#line 2740 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Asm blocks can be in the const pool - ; - break;} -case 187: -#line 2742 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[0].ConstVal.C == 0) + delete (yyvsp[(4) - (4)].TypeVal).PAT; + ;} + break; + + case 186: +#line 2664 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Function prototypes can be in const pool + ;} + break; + + case 187: +#line 2666 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Asm blocks can be in the const pool + ;} + break; + + case 188: +#line 2668 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(5) - (5)].ConstVal).C == 0) error("Global value initializer is not a constant"); - CurGV = ParseGlobalVariable(yyvsp[-3].StrVal, yyvsp[-2].Linkage, yyvsp[-1].BoolVal, yyvsp[0].ConstVal.C->getType(), yyvsp[0].ConstVal.C, yyvsp[0].ConstVal.S); - ; - break;} -case 188: -#line 2746 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + CurGV = ParseGlobalVariable((yyvsp[(2) - (5)].StrVal), (yyvsp[(3) - (5)].Linkage), (yyvsp[(4) - (5)].BoolVal), (yyvsp[(5) - (5)].ConstVal).C->getType(), (yyvsp[(5) - (5)].ConstVal).C, (yyvsp[(5) - (5)].ConstVal).S); + ;} + break; + + case 189: +#line 2672 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { CurGV = 0; - ; - break;} -case 189: -#line 2749 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[0].TypeVal.PAT->get(); - CurGV = ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::ExternalLinkage, yyvsp[-1].BoolVal, Ty, 0, - yyvsp[0].TypeVal.S); - delete yyvsp[0].TypeVal.PAT; - ; - break;} -case 190: -#line 2754 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + ;} + break; + + case 190: +#line 2675 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(5) - (5)].TypeVal).PAT->get(); + CurGV = ParseGlobalVariable((yyvsp[(2) - (5)].StrVal), GlobalValue::ExternalLinkage, (yyvsp[(4) - (5)].BoolVal), Ty, 0, + (yyvsp[(5) - (5)].TypeVal).S); + delete (yyvsp[(5) - (5)].TypeVal).PAT; + ;} + break; + + case 191: +#line 2680 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { CurGV = 0; - ; - break;} -case 191: -#line 2757 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[0].TypeVal.PAT->get(); - CurGV = ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::DLLImportLinkage, yyvsp[-1].BoolVal, Ty, 0, - yyvsp[0].TypeVal.S); - delete yyvsp[0].TypeVal.PAT; - ; - break;} -case 192: -#line 2762 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + ;} + break; + + case 192: +#line 2683 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(5) - (5)].TypeVal).PAT->get(); + CurGV = ParseGlobalVariable((yyvsp[(2) - (5)].StrVal), GlobalValue::DLLImportLinkage, (yyvsp[(4) - (5)].BoolVal), Ty, 0, + (yyvsp[(5) - (5)].TypeVal).S); + delete (yyvsp[(5) - (5)].TypeVal).PAT; + ;} + break; + + case 193: +#line 2688 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { CurGV = 0; - ; - break;} -case 193: -#line 2765 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[0].TypeVal.PAT->get(); + ;} + break; + + case 194: +#line 2691 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(5) - (5)].TypeVal).PAT->get(); CurGV = - ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::ExternalWeakLinkage, yyvsp[-1].BoolVal, Ty, 0, - yyvsp[0].TypeVal.S); - delete yyvsp[0].TypeVal.PAT; - ; - break;} -case 194: -#line 2771 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + ParseGlobalVariable((yyvsp[(2) - (5)].StrVal), GlobalValue::ExternalWeakLinkage, (yyvsp[(4) - (5)].BoolVal), Ty, 0, + (yyvsp[(5) - (5)].TypeVal).S); + delete (yyvsp[(5) - (5)].TypeVal).PAT; + ;} + break; + + case 195: +#line 2697 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { CurGV = 0; - ; - break;} -case 195: -#line 2774 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - ; - break;} -case 196: -#line 2776 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - ; - break;} -case 197: -#line 2778 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - ; - break;} -case 198: -#line 2783 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + ;} + break; + + case 196: +#line 2700 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + ;} + break; + + case 197: +#line 2702 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + ;} + break; + + case 198: +#line 2704 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + ;} + break; + + case 199: +#line 2709 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm(); - char *EndStr = UnEscapeLexed(yyvsp[0].StrVal, true); - std::string NewAsm(yyvsp[0].StrVal, EndStr); - free(yyvsp[0].StrVal); + char *EndStr = UnEscapeLexed((yyvsp[(1) - (1)].StrVal), true); + std::string NewAsm((yyvsp[(1) - (1)].StrVal), EndStr); + free((yyvsp[(1) - (1)].StrVal)); if (AsmSoFar.empty()) CurModule.CurrentModule->setModuleInlineAsm(NewAsm); else CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+NewAsm); - ; - break;} -case 199: -#line 2797 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Endianness = Module::BigEndian; ; - break;} -case 200: -#line 2798 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Endianness = Module::LittleEndian; ; - break;} -case 201: -#line 2802 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - CurModule.setEndianness(yyvsp[0].Endianness); - ; - break;} -case 202: -#line 2805 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[0].UInt64Val == 32) + ;} + break; + + case 200: +#line 2723 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Endianness) = Module::BigEndian; ;} + break; + + case 201: +#line 2724 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Endianness) = Module::LittleEndian; ;} + break; + + case 202: +#line 2728 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + CurModule.setEndianness((yyvsp[(3) - (3)].Endianness)); + ;} + break; + + case 203: +#line 2731 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(3) - (3)].UInt64Val) == 32) CurModule.setPointerSize(Module::Pointer32); - else if (yyvsp[0].UInt64Val == 64) + else if ((yyvsp[(3) - (3)].UInt64Val) == 64) CurModule.setPointerSize(Module::Pointer64); else - error("Invalid pointer size: '" + utostr(yyvsp[0].UInt64Val) + "'"); - ; - break;} -case 203: -#line 2813 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - CurModule.CurrentModule->setTargetTriple(yyvsp[0].StrVal); - free(yyvsp[0].StrVal); - ; - break;} -case 204: -#line 2817 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - CurModule.CurrentModule->setDataLayout(yyvsp[0].StrVal); - free(yyvsp[0].StrVal); - ; - break;} -case 206: -#line 2828 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal); - free(yyvsp[0].StrVal); - ; - break;} -case 207: -#line 2832 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal); - free(yyvsp[0].StrVal); - ; - break;} -case 208: -#line 2836 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ ; - break;} -case 212: -#line 2849 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.StrVal = 0; ; - break;} -case 213: -#line 2853 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[-1].TypeVal.PAT->get() == Type::VoidTy) + error("Invalid pointer size: '" + utostr((yyvsp[(3) - (3)].UInt64Val)) + "'"); + ;} + break; + + case 204: +#line 2739 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + CurModule.CurrentModule->setTargetTriple((yyvsp[(3) - (3)].StrVal)); + free((yyvsp[(3) - (3)].StrVal)); + ;} + break; + + case 205: +#line 2743 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + CurModule.CurrentModule->setDataLayout((yyvsp[(3) - (3)].StrVal)); + free((yyvsp[(3) - (3)].StrVal)); + ;} + break; + + case 207: +#line 2754 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + CurModule.CurrentModule->addLibrary((yyvsp[(3) - (3)].StrVal)); + free((yyvsp[(3) - (3)].StrVal)); + ;} + break; + + case 208: +#line 2758 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + CurModule.CurrentModule->addLibrary((yyvsp[(1) - (1)].StrVal)); + free((yyvsp[(1) - (1)].StrVal)); + ;} + break; + + case 209: +#line 2762 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { ;} + break; + + case 213: +#line 2775 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.StrVal) = 0; ;} + break; + + case 214: +#line 2779 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(1) - (2)].TypeVal).PAT->get() == Type::VoidTy) error("void typed arguments are invalid"); - yyval.ArgVal = new std::pair(yyvsp[-1].TypeVal, yyvsp[0].StrVal); - ; - break;} -case 214: -#line 2861 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ArgList = yyvsp[-2].ArgList; - yyval.ArgList->push_back(*yyvsp[0].ArgVal); - delete yyvsp[0].ArgVal; - ; - break;} -case 215: -#line 2866 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ArgList = new std::vector >(); - yyval.ArgList->push_back(*yyvsp[0].ArgVal); - delete yyvsp[0].ArgVal; - ; - break;} -case 216: -#line 2874 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ArgList = yyvsp[0].ArgList; ; - break;} -case 217: -#line 2875 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ArgList = yyvsp[-2].ArgList; + (yyval.ArgVal) = new std::pair((yyvsp[(1) - (2)].TypeVal), (yyvsp[(2) - (2)].StrVal)); + ;} + break; + + case 215: +#line 2787 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList); + (yyval.ArgList)->push_back(*(yyvsp[(3) - (3)].ArgVal)); + delete (yyvsp[(3) - (3)].ArgVal); + ;} + break; + + case 216: +#line 2792 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ArgList) = new std::vector >(); + (yyval.ArgList)->push_back(*(yyvsp[(1) - (1)].ArgVal)); + delete (yyvsp[(1) - (1)].ArgVal); + ;} + break; + + case 217: +#line 2800 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList); ;} + break; + + case 218: +#line 2801 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList); PATypeInfo VoidTI; VoidTI.PAT = new PATypeHolder(Type::VoidTy); VoidTI.S.makeSignless(); - yyval.ArgList->push_back(std::pair(VoidTI, 0)); - ; - break;} -case 218: -#line 2882 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ArgList = new std::vector >(); + (yyval.ArgList)->push_back(std::pair(VoidTI, 0)); + ;} + break; + + case 219: +#line 2808 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ArgList) = new std::vector >(); PATypeInfo VoidTI; VoidTI.PAT = new PATypeHolder(Type::VoidTy); VoidTI.S.makeSignless(); - yyval.ArgList->push_back(std::pair(VoidTI, 0)); - ; - break;} -case 219: -#line 2889 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ArgList = 0; ; - break;} -case 220: -#line 2893 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - UnEscapeLexed(yyvsp[-5].StrVal); - std::string FunctionName(yyvsp[-5].StrVal); - free(yyvsp[-5].StrVal); // Free strdup'd memory! + (yyval.ArgList)->push_back(std::pair(VoidTI, 0)); + ;} + break; + + case 220: +#line 2815 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ArgList) = 0; ;} + break; + + case 221: +#line 2819 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + UnEscapeLexed((yyvsp[(3) - (8)].StrVal)); + std::string FunctionName((yyvsp[(3) - (8)].StrVal)); + free((yyvsp[(3) - (8)].StrVal)); // Free strdup'd memory! - const Type* RetTy = yyvsp[-6].TypeVal.PAT->get(); + const Type* RetTy = (yyvsp[(2) - (8)].TypeVal).PAT->get(); if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy) error("LLVM functions cannot return aggregate types"); Signedness FTySign; - FTySign.makeComposite(yyvsp[-6].TypeVal.S); + FTySign.makeComposite((yyvsp[(2) - (8)].TypeVal).S); std::vector ParamTyList; // In LLVM 2.0 the signatures of three varargs intrinsics changed to take @@ -4592,9 +5544,9 @@ case 220: } else if (FunctionName == "llvm.va_copy") { ParamTyList.push_back(PointerType::get(Type::Int8Ty)); ParamTyList.push_back(PointerType::get(Type::Int8Ty)); - } else if (yyvsp[-3].ArgList) { // If there are arguments... + } else if ((yyvsp[(5) - (8)].ArgList)) { // If there are arguments... for (std::vector >::iterator - I = yyvsp[-3].ArgList->begin(), E = yyvsp[-3].ArgList->end(); I != E; ++I) { + I = (yyvsp[(5) - (8)].ArgList)->begin(), E = (yyvsp[(5) - (8)].ArgList)->end(); I != E; ++I) { const Type *Ty = I->first.PAT->get(); ParamTyList.push_back(Ty); FTySign.add(I->first.S); @@ -4605,21 +5557,9 @@ case 220: if (isVarArg) ParamTyList.pop_back(); - // Convert the CSRet calling convention into the corresponding parameter - // attribute. - ParamAttrsList *PAL = 0; - if (yyvsp[-7].UIntVal == OldCallingConv::CSRet) { - ParamAttrsVector Attrs; - ParamAttrsWithIndex PAWI; - PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg - Attrs.push_back(PAWI); - PAL = ParamAttrsList::get(Attrs); - } - - const FunctionType *FT = - FunctionType::get(RetTy, ParamTyList, isVarArg, PAL); + const FunctionType *FT = FunctionType::get(RetTy, ParamTyList, isVarArg); const PointerType *PFT = PointerType::get(FT); - delete yyvsp[-6].TypeVal.PAT; + delete (yyvsp[(2) - (8)].TypeVal).PAT; ValID ID; if (!FunctionName.empty()) { @@ -4728,143 +5668,173 @@ case 220: // argument to another function. Fn->setLinkage(CurFun.Linkage); } - Fn->setCallingConv(upgradeCallingConv(yyvsp[-7].UIntVal)); - Fn->setAlignment(yyvsp[0].UIntVal); - if (yyvsp[-1].StrVal) { - Fn->setSection(yyvsp[-1].StrVal); - free(yyvsp[-1].StrVal); + Fn->setCallingConv(upgradeCallingConv((yyvsp[(1) - (8)].UIntVal))); + Fn->setAlignment((yyvsp[(8) - (8)].UIntVal)); + if ((yyvsp[(7) - (8)].StrVal)) { + Fn->setSection((yyvsp[(7) - (8)].StrVal)); + free((yyvsp[(7) - (8)].StrVal)); + } + + // Convert the CSRet calling convention into the corresponding parameter + // attribute. + if ((yyvsp[(1) - (8)].UIntVal) == OldCallingConv::CSRet) { + ParamAttrsVector Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg + Attrs.push_back(PAWI); + Fn->setParamAttrs(ParamAttrsList::get(Attrs)); } // Add all of the arguments we parsed to the function... - if (yyvsp[-3].ArgList) { // Is null if empty... + if ((yyvsp[(5) - (8)].ArgList)) { // Is null if empty... if (isVarArg) { // Nuke the last entry - assert(yyvsp[-3].ArgList->back().first.PAT->get() == Type::VoidTy && - yyvsp[-3].ArgList->back().second == 0 && "Not a varargs marker"); - delete yyvsp[-3].ArgList->back().first.PAT; - yyvsp[-3].ArgList->pop_back(); // Delete the last entry + assert((yyvsp[(5) - (8)].ArgList)->back().first.PAT->get() == Type::VoidTy && + (yyvsp[(5) - (8)].ArgList)->back().second == 0 && "Not a varargs marker"); + delete (yyvsp[(5) - (8)].ArgList)->back().first.PAT; + (yyvsp[(5) - (8)].ArgList)->pop_back(); // Delete the last entry } Function::arg_iterator ArgIt = Fn->arg_begin(); Function::arg_iterator ArgEnd = Fn->arg_end(); - std::vector >::iterator I = yyvsp[-3].ArgList->begin(); - std::vector >::iterator E = yyvsp[-3].ArgList->end(); + std::vector >::iterator I = (yyvsp[(5) - (8)].ArgList)->begin(); + std::vector >::iterator E = (yyvsp[(5) - (8)].ArgList)->end(); for ( ; I != E && ArgIt != ArgEnd; ++I, ++ArgIt) { delete I->first.PAT; // Delete the typeholder... ValueInfo VI; VI.V = ArgIt; VI.S.copy(I->first.S); setValueName(VI, I->second); // Insert arg into symtab... InsertValue(ArgIt); } - delete yyvsp[-3].ArgList; // We're now done with the argument list + delete (yyvsp[(5) - (8)].ArgList); // We're now done with the argument list } lastCallingConv = OldCallingConv::C; - ; - break;} -case 223: -#line 3087 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ CurFun.Linkage = yyvsp[0].Linkage; ; - break;} -case 224: -#line 3087 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.FunctionVal = CurFun.CurrentFunction; + ;} + break; + + case 224: +#line 3011 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { CurFun.Linkage = (yyvsp[(1) - (1)].Linkage); ;} + break; + + case 225: +#line 3011 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.FunctionVal) = CurFun.CurrentFunction; // Make sure that we keep track of the linkage type even if there was a // previous "declare". - yyval.FunctionVal->setLinkage(yyvsp[-3].Linkage); - ; - break;} -case 227: -#line 3101 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.FunctionVal = yyvsp[-1].FunctionVal; - ; - break;} -case 228: -#line 3106 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::ExternalLinkage; ; - break;} -case 229: -#line 3107 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::DLLImportLinkage; ; - break;} -case 230: -#line 3108 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.Linkage = GlobalValue::ExternalWeakLinkage; ; - break;} -case 231: -#line 3112 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ CurFun.isDeclare = true; ; - break;} -case 232: -#line 3113 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ CurFun.Linkage = yyvsp[0].Linkage; ; - break;} -case 233: -#line 3113 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.FunctionVal = CurFun.CurrentFunction; + (yyval.FunctionVal)->setLinkage((yyvsp[(1) - (4)].Linkage)); + ;} + break; + + case 228: +#line 3025 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); + ;} + break; + + case 229: +#line 3030 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} + break; + + case 230: +#line 3031 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;} + break; + + case 231: +#line 3032 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;} + break; + + case 232: +#line 3036 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { CurFun.isDeclare = true; ;} + break; + + case 233: +#line 3037 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { CurFun.Linkage = (yyvsp[(3) - (3)].Linkage); ;} + break; + + case 234: +#line 3037 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.FunctionVal) = CurFun.CurrentFunction; CurFun.FunctionDone(); - ; - break;} -case 234: -#line 3125 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.BoolVal = false; ; - break;} -case 235: -#line 3126 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.BoolVal = true; ; - break;} -case 236: -#line 3131 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValIDVal = ValID::create(yyvsp[0].SInt64Val); ; - break;} -case 237: -#line 3132 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValIDVal = ValID::create(yyvsp[0].UInt64Val); ; - break;} -case 238: -#line 3133 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValIDVal = ValID::create(yyvsp[0].FPVal); ; - break;} -case 239: -#line 3134 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ValIDVal = ValID::create(ConstantInt::get(Type::Int1Ty, true)); - yyval.ValIDVal.S.makeUnsigned(); - ; - break;} -case 240: -#line 3138 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ValIDVal = ValID::create(ConstantInt::get(Type::Int1Ty, false)); - yyval.ValIDVal.S.makeUnsigned(); - ; - break;} -case 241: -#line 3142 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValIDVal = ValID::createNull(); ; - break;} -case 242: -#line 3143 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValIDVal = ValID::createUndef(); ; - break;} -case 243: -#line 3144 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValIDVal = ValID::createZeroInit(); ; - break;} -case 244: -#line 3145 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Nonempty unsized packed vector - const Type *ETy = (*yyvsp[-1].ConstVector)[0].C->getType(); - int NumElements = yyvsp[-1].ConstVector->size(); + ;} + break; + + case 235: +#line 3049 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.BoolVal) = false; ;} + break; + + case 236: +#line 3050 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.BoolVal) = true; ;} + break; + + case 237: +#line 3055 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val)); ;} + break; + + case 238: +#line 3056 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val)); ;} + break; + + case 239: +#line 3057 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal)); ;} + break; + + case 240: +#line 3058 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, true)); + (yyval.ValIDVal).S.makeUnsigned(); + ;} + break; + + case 241: +#line 3062 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, false)); + (yyval.ValIDVal).S.makeUnsigned(); + ;} + break; + + case 242: +#line 3066 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValIDVal) = ValID::createNull(); ;} + break; + + case 243: +#line 3067 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValIDVal) = ValID::createUndef(); ;} + break; + + case 244: +#line 3068 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValIDVal) = ValID::createZeroInit(); ;} + break; + + case 245: +#line 3069 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Nonempty unsized packed vector + const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0].C->getType(); + int NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); VectorType* pt = VectorType::get(ETy, NumElements); - yyval.ValIDVal.S.makeComposite((*yyvsp[-1].ConstVector)[0].S); - PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt, yyval.ValIDVal.S)); + (yyval.ValIDVal).S.makeComposite((*(yyvsp[(2) - (3)].ConstVector))[0].S); + PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt, (yyval.ValIDVal).S)); // Verify all elements are correct type! std::vector Elems; - for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) { - Constant *C = (*yyvsp[-1].ConstVector)[i].C; + for (unsigned i = 0; i < (yyvsp[(2) - (3)].ConstVector)->size(); i++) { + Constant *C = (*(yyvsp[(2) - (3)].ConstVector))[i].C; const Type *CTy = C->getType(); if (ETy != CTy) error("Element #" + utostr(i) + " is not of type '" + @@ -4872,226 +5842,236 @@ case 244: CTy->getDescription() + "'"); Elems.push_back(C); } - yyval.ValIDVal = ValID::create(ConstantVector::get(pt, Elems)); - delete PTy; delete yyvsp[-1].ConstVector; - ; - break;} -case 245: -#line 3166 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ValIDVal = ValID::create(yyvsp[0].ConstVal.C); - yyval.ValIDVal.S.copy(yyvsp[0].ConstVal.S); - ; - break;} -case 246: -#line 3170 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - char *End = UnEscapeLexed(yyvsp[-2].StrVal, true); - std::string AsmStr = std::string(yyvsp[-2].StrVal, End); - End = UnEscapeLexed(yyvsp[0].StrVal, true); - std::string Constraints = std::string(yyvsp[0].StrVal, End); - yyval.ValIDVal = ValID::createInlineAsm(AsmStr, Constraints, yyvsp[-3].BoolVal); - free(yyvsp[-2].StrVal); - free(yyvsp[0].StrVal); - ; - break;} -case 247: -#line 3184 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValIDVal = ValID::create(yyvsp[0].SIntVal); yyval.ValIDVal.S.makeSignless(); ; - break;} -case 248: -#line 3185 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValIDVal = ValID::create(yyvsp[0].StrVal); yyval.ValIDVal.S.makeSignless(); ; - break;} -case 251: -#line 3198 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[-1].TypeVal.PAT->get(); - yyvsp[0].ValIDVal.S.copy(yyvsp[-1].TypeVal.S); - yyval.ValueVal.V = getVal(Ty, yyvsp[0].ValIDVal); - yyval.ValueVal.S.copy(yyvsp[-1].TypeVal.S); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 252: -#line 3208 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.FunctionVal = yyvsp[-1].FunctionVal; - ; - break;} -case 253: -#line 3211 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Do not allow functions with 0 basic blocks - yyval.FunctionVal = yyvsp[-1].FunctionVal; - ; - break;} -case 254: -#line 3220 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - ValueInfo VI; VI.V = yyvsp[0].TermInstVal.TI; VI.S.copy(yyvsp[0].TermInstVal.S); - setValueName(VI, yyvsp[-1].StrVal); - InsertValue(yyvsp[0].TermInstVal.TI); - yyvsp[-2].BasicBlockVal->getInstList().push_back(yyvsp[0].TermInstVal.TI); - InsertValue(yyvsp[-2].BasicBlockVal); - yyval.BasicBlockVal = yyvsp[-2].BasicBlockVal; - ; - break;} -case 255: -#line 3231 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (yyvsp[0].InstVal.I) - yyvsp[-1].BasicBlockVal->getInstList().push_back(yyvsp[0].InstVal.I); - yyval.BasicBlockVal = yyvsp[-1].BasicBlockVal; - ; - break;} -case 256: -#line 3236 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.BasicBlockVal = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++),true); + (yyval.ValIDVal) = ValID::create(ConstantVector::get(pt, Elems)); + delete PTy; delete (yyvsp[(2) - (3)].ConstVector); + ;} + break; + + case 246: +#line 3090 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal).C); + (yyval.ValIDVal).S.copy((yyvsp[(1) - (1)].ConstVal).S); + ;} + break; + + case 247: +#line 3094 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + char *End = UnEscapeLexed((yyvsp[(3) - (5)].StrVal), true); + std::string AsmStr = std::string((yyvsp[(3) - (5)].StrVal), End); + End = UnEscapeLexed((yyvsp[(5) - (5)].StrVal), true); + std::string Constraints = std::string((yyvsp[(5) - (5)].StrVal), End); + (yyval.ValIDVal) = ValID::createInlineAsm(AsmStr, Constraints, (yyvsp[(2) - (5)].BoolVal)); + free((yyvsp[(3) - (5)].StrVal)); + free((yyvsp[(5) - (5)].StrVal)); + ;} + break; + + case 248: +#line 3108 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SIntVal)); (yyval.ValIDVal).S.makeSignless(); ;} + break; + + case 249: +#line 3109 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].StrVal)); (yyval.ValIDVal).S.makeSignless(); ;} + break; + + case 252: +#line 3122 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(1) - (2)].TypeVal).PAT->get(); + (yyvsp[(2) - (2)].ValIDVal).S.copy((yyvsp[(1) - (2)].TypeVal).S); + (yyval.ValueVal).V = getVal(Ty, (yyvsp[(2) - (2)].ValIDVal)); + (yyval.ValueVal).S.copy((yyvsp[(1) - (2)].TypeVal).S); + delete (yyvsp[(1) - (2)].TypeVal).PAT; + ;} + break; + + case 253: +#line 3132 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); + ;} + break; + + case 254: +#line 3135 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Do not allow functions with 0 basic blocks + (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); + ;} + break; + + case 255: +#line 3144 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + ValueInfo VI; VI.V = (yyvsp[(3) - (3)].TermInstVal).TI; VI.S.copy((yyvsp[(3) - (3)].TermInstVal).S); + setValueName(VI, (yyvsp[(2) - (3)].StrVal)); + InsertValue((yyvsp[(3) - (3)].TermInstVal).TI); + (yyvsp[(1) - (3)].BasicBlockVal)->getInstList().push_back((yyvsp[(3) - (3)].TermInstVal).TI); + InsertValue((yyvsp[(1) - (3)].BasicBlockVal)); + (yyval.BasicBlockVal) = (yyvsp[(1) - (3)].BasicBlockVal); + ;} + break; + + case 256: +#line 3155 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if ((yyvsp[(2) - (2)].InstVal).I) + (yyvsp[(1) - (2)].BasicBlockVal)->getInstList().push_back((yyvsp[(2) - (2)].InstVal).I); + (yyval.BasicBlockVal) = (yyvsp[(1) - (2)].BasicBlockVal); + ;} + break; + + case 257: +#line 3160 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++),true); // Make sure to move the basic block to the correct location in the // function, instead of leaving it inserted wherever it was first // referenced. Function::BasicBlockListType &BBL = CurFun.CurrentFunction->getBasicBlockList(); - BBL.splice(BBL.end(), BBL, yyval.BasicBlockVal); - ; - break;} -case 257: -#line 3245 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.BasicBlockVal = CurBB = getBBVal(ValID::create(yyvsp[0].StrVal), true); + BBL.splice(BBL.end(), BBL, (yyval.BasicBlockVal)); + ;} + break; + + case 258: +#line 3169 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((yyvsp[(1) - (1)].StrVal)), true); // Make sure to move the basic block to the correct location in the // function, instead of leaving it inserted wherever it was first // referenced. Function::BasicBlockListType &BBL = CurFun.CurrentFunction->getBasicBlockList(); - BBL.splice(BBL.end(), BBL, yyval.BasicBlockVal); - ; - break;} -case 260: -#line 3259 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Return with a result... - yyval.TermInstVal.TI = new ReturnInst(yyvsp[0].ValueVal.V); - yyval.TermInstVal.S.makeSignless(); - ; - break;} -case 261: -#line 3263 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Return with no result... - yyval.TermInstVal.TI = new ReturnInst(); - yyval.TermInstVal.S.makeSignless(); - ; - break;} -case 262: -#line 3267 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Unconditional Branch... - BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal); - yyval.TermInstVal.TI = new BranchInst(tmpBB); - yyval.TermInstVal.S.makeSignless(); - ; - break;} -case 263: -#line 3272 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[-3].ValIDVal.S.makeSignless(); - yyvsp[0].ValIDVal.S.makeSignless(); - BasicBlock* tmpBBA = getBBVal(yyvsp[-3].ValIDVal); - BasicBlock* tmpBBB = getBBVal(yyvsp[0].ValIDVal); - yyvsp[-6].ValIDVal.S.makeUnsigned(); - Value* tmpVal = getVal(Type::Int1Ty, yyvsp[-6].ValIDVal); - yyval.TermInstVal.TI = new BranchInst(tmpBBA, tmpBBB, tmpVal); - yyval.TermInstVal.S.makeSignless(); - ; - break;} -case 264: -#line 3282 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[-6].ValIDVal.S.copy(yyvsp[-7].PrimType.S); - Value* tmpVal = getVal(yyvsp[-7].PrimType.T, yyvsp[-6].ValIDVal); - yyvsp[-3].ValIDVal.S.makeSignless(); - BasicBlock* tmpBB = getBBVal(yyvsp[-3].ValIDVal); - SwitchInst *S = new SwitchInst(tmpVal, tmpBB, yyvsp[-1].JumpTable->size()); - yyval.TermInstVal.TI = S; - yyval.TermInstVal.S.makeSignless(); - std::vector >::iterator I = yyvsp[-1].JumpTable->begin(), - E = yyvsp[-1].JumpTable->end(); + BBL.splice(BBL.end(), BBL, (yyval.BasicBlockVal)); + ;} + break; + + case 261: +#line 3183 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Return with a result... + (yyval.TermInstVal).TI = new ReturnInst((yyvsp[(2) - (2)].ValueVal).V); + (yyval.TermInstVal).S.makeSignless(); + ;} + break; + + case 262: +#line 3187 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Return with no result... + (yyval.TermInstVal).TI = new ReturnInst(); + (yyval.TermInstVal).S.makeSignless(); + ;} + break; + + case 263: +#line 3191 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Unconditional Branch... + BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal)); + (yyval.TermInstVal).TI = new BranchInst(tmpBB); + (yyval.TermInstVal).S.makeSignless(); + ;} + break; + + case 264: +#line 3196 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(6) - (9)].ValIDVal).S.makeSignless(); + (yyvsp[(9) - (9)].ValIDVal).S.makeSignless(); + BasicBlock* tmpBBA = getBBVal((yyvsp[(6) - (9)].ValIDVal)); + BasicBlock* tmpBBB = getBBVal((yyvsp[(9) - (9)].ValIDVal)); + (yyvsp[(3) - (9)].ValIDVal).S.makeUnsigned(); + Value* tmpVal = getVal(Type::Int1Ty, (yyvsp[(3) - (9)].ValIDVal)); + (yyval.TermInstVal).TI = new BranchInst(tmpBBA, tmpBBB, tmpVal); + (yyval.TermInstVal).S.makeSignless(); + ;} + break; + + case 265: +#line 3206 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(3) - (9)].ValIDVal).S.copy((yyvsp[(2) - (9)].PrimType).S); + Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType).T, (yyvsp[(3) - (9)].ValIDVal)); + (yyvsp[(6) - (9)].ValIDVal).S.makeSignless(); + BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (9)].ValIDVal)); + SwitchInst *S = new SwitchInst(tmpVal, tmpBB, (yyvsp[(8) - (9)].JumpTable)->size()); + (yyval.TermInstVal).TI = S; + (yyval.TermInstVal).S.makeSignless(); + std::vector >::iterator I = (yyvsp[(8) - (9)].JumpTable)->begin(), + E = (yyvsp[(8) - (9)].JumpTable)->end(); for (; I != E; ++I) { if (ConstantInt *CI = dyn_cast(I->first)) S->addCase(CI, I->second); else error("Switch case is constant, but not a simple integer"); } - delete yyvsp[-1].JumpTable; - ; - break;} -case 265: -#line 3300 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[-5].ValIDVal.S.copy(yyvsp[-6].PrimType.S); - Value* tmpVal = getVal(yyvsp[-6].PrimType.T, yyvsp[-5].ValIDVal); - yyvsp[-2].ValIDVal.S.makeSignless(); - BasicBlock* tmpBB = getBBVal(yyvsp[-2].ValIDVal); + delete (yyvsp[(8) - (9)].JumpTable); + ;} + break; + + case 266: +#line 3224 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(3) - (8)].ValIDVal).S.copy((yyvsp[(2) - (8)].PrimType).S); + Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType).T, (yyvsp[(3) - (8)].ValIDVal)); + (yyvsp[(6) - (8)].ValIDVal).S.makeSignless(); + BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (8)].ValIDVal)); SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0); - yyval.TermInstVal.TI = S; - yyval.TermInstVal.S.makeSignless(); - ; - break;} -case 266: -#line 3310 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + (yyval.TermInstVal).TI = S; + (yyval.TermInstVal).S.makeSignless(); + ;} + break; + + case 267: +#line 3234 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { const PointerType *PFTy; const FunctionType *Ty; Signedness FTySign; - if (!(PFTy = dyn_cast(yyvsp[-10].TypeVal.PAT->get())) || + if (!(PFTy = dyn_cast((yyvsp[(3) - (13)].TypeVal).PAT->get())) || !(Ty = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; - FTySign.makeComposite(yyvsp[-10].TypeVal.S); - if (yyvsp[-7].ValueList) { - for (std::vector::iterator I = yyvsp[-7].ValueList->begin(), E = yyvsp[-7].ValueList->end(); + FTySign.makeComposite((yyvsp[(3) - (13)].TypeVal).S); + if ((yyvsp[(6) - (13)].ValueList)) { + for (std::vector::iterator I = (yyvsp[(6) - (13)].ValueList)->begin(), E = (yyvsp[(6) - (13)].ValueList)->end(); I != E; ++I) { ParamTypes.push_back((*I).V->getType()); FTySign.add(I->S); } } - ParamAttrsList *PAL = 0; - if (yyvsp[-11].UIntVal == OldCallingConv::CSRet) { - ParamAttrsVector Attrs; - ParamAttrsWithIndex PAWI; - PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg - Attrs.push_back(PAWI); - PAL = ParamAttrsList::get(Attrs); - } bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy; if (isVarArg) ParamTypes.pop_back(); - Ty = FunctionType::get(yyvsp[-10].TypeVal.PAT->get(), ParamTypes, isVarArg, PAL); + Ty = FunctionType::get((yyvsp[(3) - (13)].TypeVal).PAT->get(), ParamTypes, isVarArg); PFTy = PointerType::get(Ty); - yyval.TermInstVal.S.copy(yyvsp[-10].TypeVal.S); + (yyval.TermInstVal).S.copy((yyvsp[(3) - (13)].TypeVal).S); } else { - FTySign = yyvsp[-10].TypeVal.S; + FTySign = (yyvsp[(3) - (13)].TypeVal).S; // Get the signedness of the result type. $3 is the pointer to the // function type so we get the 0th element to extract the function type, // and then the 0th element again to get the result type. - yyval.TermInstVal.S.copy(yyvsp[-10].TypeVal.S.get(0).get(0)); + (yyval.TermInstVal).S.copy((yyvsp[(3) - (13)].TypeVal).S.get(0).get(0)); } - yyvsp[-9].ValIDVal.S.makeComposite(FTySign); - Value *V = getVal(PFTy, yyvsp[-9].ValIDVal); // Get the function we're calling... - BasicBlock *Normal = getBBVal(yyvsp[-3].ValIDVal); - BasicBlock *Except = getBBVal(yyvsp[0].ValIDVal); + (yyvsp[(4) - (13)].ValIDVal).S.makeComposite(FTySign); + Value *V = getVal(PFTy, (yyvsp[(4) - (13)].ValIDVal)); // Get the function we're calling... + BasicBlock *Normal = getBBVal((yyvsp[(10) - (13)].ValIDVal)); + BasicBlock *Except = getBBVal((yyvsp[(13) - (13)].ValIDVal)); // Create the call node... - if (!yyvsp[-7].ValueList) { // Has no arguments? + if (!(yyvsp[(6) - (13)].ValueList)) { // Has no arguments? std::vector Args; - yyval.TermInstVal.TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); + (yyval.TermInstVal).TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); } else { // Has arguments? // Loop through FunctionType's arguments and ensure they are specified // correctly! // FunctionType::param_iterator I = Ty->param_begin(); FunctionType::param_iterator E = Ty->param_end(); - std::vector::iterator ArgI = yyvsp[-7].ValueList->begin(), ArgE = yyvsp[-7].ValueList->end(); + std::vector::iterator ArgI = (yyvsp[(6) - (13)].ValueList)->begin(), ArgE = (yyvsp[(6) - (13)].ValueList)->end(); std::vector Args; for (; ArgI != ArgE && I != E; ++ArgI, ++I) { @@ -5104,66 +6084,78 @@ case 266: if (I != E || (ArgI != ArgE && !Ty->isVarArg())) error("Invalid number of parameters detected"); - yyval.TermInstVal.TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); + (yyval.TermInstVal).TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); + } + cast((yyval.TermInstVal).TI)->setCallingConv(upgradeCallingConv((yyvsp[(2) - (13)].UIntVal))); + if ((yyvsp[(2) - (13)].UIntVal) == OldCallingConv::CSRet) { + ParamAttrsVector Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg + Attrs.push_back(PAWI); + cast((yyval.TermInstVal).TI)->setParamAttrs(ParamAttrsList::get(Attrs)); } - cast(yyval.TermInstVal.TI)->setCallingConv(upgradeCallingConv(yyvsp[-11].UIntVal)); - delete yyvsp[-10].TypeVal.PAT; - delete yyvsp[-7].ValueList; + delete (yyvsp[(3) - (13)].TypeVal).PAT; + delete (yyvsp[(6) - (13)].ValueList); lastCallingConv = OldCallingConv::C; - ; - break;} -case 267: -#line 3383 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.TermInstVal.TI = new UnwindInst(); - yyval.TermInstVal.S.makeSignless(); - ; - break;} -case 268: -#line 3387 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.TermInstVal.TI = new UnreachableInst(); - yyval.TermInstVal.S.makeSignless(); - ; - break;} -case 269: -#line 3394 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.JumpTable = yyvsp[-5].JumpTable; - yyvsp[-3].ValIDVal.S.copy(yyvsp[-4].PrimType.S); - Constant *V = cast(getExistingValue(yyvsp[-4].PrimType.T, yyvsp[-3].ValIDVal)); + ;} + break; + + case 268: +#line 3306 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.TermInstVal).TI = new UnwindInst(); + (yyval.TermInstVal).S.makeSignless(); + ;} + break; + + case 269: +#line 3310 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.TermInstVal).TI = new UnreachableInst(); + (yyval.TermInstVal).S.makeSignless(); + ;} + break; + + case 270: +#line 3317 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable); + (yyvsp[(3) - (6)].ValIDVal).S.copy((yyvsp[(2) - (6)].PrimType).S); + Constant *V = cast(getExistingValue((yyvsp[(2) - (6)].PrimType).T, (yyvsp[(3) - (6)].ValIDVal))); if (V == 0) error("May only switch on a constant pool value"); - yyvsp[0].ValIDVal.S.makeSignless(); - BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal); - yyval.JumpTable->push_back(std::make_pair(V, tmpBB)); - ; - break;} -case 270: -#line 3406 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.JumpTable = new std::vector >(); - yyvsp[-3].ValIDVal.S.copy(yyvsp[-4].PrimType.S); - Constant *V = cast(getExistingValue(yyvsp[-4].PrimType.T, yyvsp[-3].ValIDVal)); + (yyvsp[(6) - (6)].ValIDVal).S.makeSignless(); + BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (6)].ValIDVal)); + (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB)); + ;} + break; + + case 271: +#line 3329 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.JumpTable) = new std::vector >(); + (yyvsp[(2) - (5)].ValIDVal).S.copy((yyvsp[(1) - (5)].PrimType).S); + Constant *V = cast(getExistingValue((yyvsp[(1) - (5)].PrimType).T, (yyvsp[(2) - (5)].ValIDVal))); if (V == 0) error("May only switch on a constant pool value"); - yyvsp[0].ValIDVal.S.makeSignless(); - BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal); - yyval.JumpTable->push_back(std::make_pair(V, tmpBB)); - ; - break;} -case 271: -#line 3421 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + (yyvsp[(5) - (5)].ValIDVal).S.makeSignless(); + BasicBlock* tmpBB = getBBVal((yyvsp[(5) - (5)].ValIDVal)); + (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB)); + ;} + break; + + case 272: +#line 3344 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { bool omit = false; - if (yyvsp[-1].StrVal) - if (BitCastInst *BCI = dyn_cast(yyvsp[0].InstVal.I)) + if ((yyvsp[(1) - (2)].StrVal)) + if (BitCastInst *BCI = dyn_cast((yyvsp[(2) - (2)].InstVal).I)) if (BCI->getSrcTy() == BCI->getDestTy() && - BCI->getOperand(0)->getName() == yyvsp[-1].StrVal) + BCI->getOperand(0)->getName() == (yyvsp[(1) - (2)].StrVal)) // This is a useless bit cast causing a name redefinition. It is // a bit cast from a type to the same type of an operand with the // same name as the name we would give this instruction. Since this @@ -5178,240 +6170,258 @@ case 271: // The bitcast is clearly useless so we omit it. omit = true; if (omit) { - yyval.InstVal.I = 0; - yyval.InstVal.S.makeSignless(); + (yyval.InstVal).I = 0; + (yyval.InstVal).S.makeSignless(); } else { - ValueInfo VI; VI.V = yyvsp[0].InstVal.I; VI.S.copy(yyvsp[0].InstVal.S); - setValueName(VI, yyvsp[-1].StrVal); - InsertValue(yyvsp[0].InstVal.I); - yyval.InstVal = yyvsp[0].InstVal; + ValueInfo VI; VI.V = (yyvsp[(2) - (2)].InstVal).I; VI.S.copy((yyvsp[(2) - (2)].InstVal).S); + setValueName(VI, (yyvsp[(1) - (2)].StrVal)); + InsertValue((yyvsp[(2) - (2)].InstVal).I); + (yyval.InstVal) = (yyvsp[(2) - (2)].InstVal); } - ; - break;} -case 272: -#line 3451 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Used for PHI nodes - yyval.PHIList.P = new std::list >(); - yyval.PHIList.S.copy(yyvsp[-5].TypeVal.S); - yyvsp[-3].ValIDVal.S.copy(yyvsp[-5].TypeVal.S); - Value* tmpVal = getVal(yyvsp[-5].TypeVal.PAT->get(), yyvsp[-3].ValIDVal); - yyvsp[-1].ValIDVal.S.makeSignless(); - BasicBlock* tmpBB = getBBVal(yyvsp[-1].ValIDVal); - yyval.PHIList.P->push_back(std::make_pair(tmpVal, tmpBB)); - delete yyvsp[-5].TypeVal.PAT; - ; - break;} -case 273: -#line 3461 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.PHIList = yyvsp[-6].PHIList; - yyvsp[-3].ValIDVal.S.copy(yyvsp[-6].PHIList.S); - Value* tmpVal = getVal(yyvsp[-6].PHIList.P->front().first->getType(), yyvsp[-3].ValIDVal); - yyvsp[-1].ValIDVal.S.makeSignless(); - BasicBlock* tmpBB = getBBVal(yyvsp[-1].ValIDVal); - yyvsp[-6].PHIList.P->push_back(std::make_pair(tmpVal, tmpBB)); - ; - break;} -case 274: -#line 3471 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ // Used for call statements, and memory insts... - yyval.ValueList = new std::vector(); - yyval.ValueList->push_back(yyvsp[0].ValueVal); - ; - break;} -case 275: -#line 3475 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.ValueList = yyvsp[-2].ValueList; - yyvsp[-2].ValueList->push_back(yyvsp[0].ValueVal); - ; - break;} -case 277: -#line 3483 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValueList = 0; ; - break;} -case 278: -#line 3487 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.BoolVal = true; - ; - break;} -case 279: -#line 3490 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.BoolVal = false; - ; - break;} -case 280: -#line 3496 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[-2].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - yyvsp[0].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - const Type* Ty = yyvsp[-3].TypeVal.PAT->get(); + ;} + break; + + case 273: +#line 3374 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Used for PHI nodes + (yyval.PHIList).P = new std::list >(); + (yyval.PHIList).S.copy((yyvsp[(1) - (6)].TypeVal).S); + (yyvsp[(3) - (6)].ValIDVal).S.copy((yyvsp[(1) - (6)].TypeVal).S); + Value* tmpVal = getVal((yyvsp[(1) - (6)].TypeVal).PAT->get(), (yyvsp[(3) - (6)].ValIDVal)); + (yyvsp[(5) - (6)].ValIDVal).S.makeSignless(); + BasicBlock* tmpBB = getBBVal((yyvsp[(5) - (6)].ValIDVal)); + (yyval.PHIList).P->push_back(std::make_pair(tmpVal, tmpBB)); + delete (yyvsp[(1) - (6)].TypeVal).PAT; + ;} + break; + + case 274: +#line 3384 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.PHIList) = (yyvsp[(1) - (7)].PHIList); + (yyvsp[(4) - (7)].ValIDVal).S.copy((yyvsp[(1) - (7)].PHIList).S); + Value* tmpVal = getVal((yyvsp[(1) - (7)].PHIList).P->front().first->getType(), (yyvsp[(4) - (7)].ValIDVal)); + (yyvsp[(6) - (7)].ValIDVal).S.makeSignless(); + BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (7)].ValIDVal)); + (yyvsp[(1) - (7)].PHIList).P->push_back(std::make_pair(tmpVal, tmpBB)); + ;} + break; + + case 275: +#line 3394 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Used for call statements, and memory insts... + (yyval.ValueList) = new std::vector(); + (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal)); + ;} + break; + + case 276: +#line 3398 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList); + (yyvsp[(1) - (3)].ValueList)->push_back((yyvsp[(3) - (3)].ValueVal)); + ;} + break; + + case 278: +#line 3406 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValueList) = 0; ;} + break; + + case 279: +#line 3410 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.BoolVal) = true; + ;} + break; + + case 280: +#line 3413 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.BoolVal) = false; + ;} + break; + + case 281: +#line 3419 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(3) - (5)].ValIDVal).S.copy((yyvsp[(2) - (5)].TypeVal).S); + (yyvsp[(5) - (5)].ValIDVal).S.copy((yyvsp[(2) - (5)].TypeVal).S); + const Type* Ty = (yyvsp[(2) - (5)].TypeVal).PAT->get(); if (!Ty->isInteger() && !Ty->isFloatingPoint() && !isa(Ty)) error("Arithmetic operator requires integer, FP, or packed operands"); if (isa(Ty) && - (yyvsp[-4].BinaryOpVal == URemOp || yyvsp[-4].BinaryOpVal == SRemOp || yyvsp[-4].BinaryOpVal == FRemOp || yyvsp[-4].BinaryOpVal == RemOp)) + ((yyvsp[(1) - (5)].BinaryOpVal) == URemOp || (yyvsp[(1) - (5)].BinaryOpVal) == SRemOp || (yyvsp[(1) - (5)].BinaryOpVal) == FRemOp || (yyvsp[(1) - (5)].BinaryOpVal) == RemOp)) error("Remainder not supported on vector types"); // Upgrade the opcode from obsolete versions before we do anything with it. - Instruction::BinaryOps Opcode = getBinaryOp(yyvsp[-4].BinaryOpVal, Ty, yyvsp[-3].TypeVal.S); - Value* val1 = getVal(Ty, yyvsp[-2].ValIDVal); - Value* val2 = getVal(Ty, yyvsp[0].ValIDVal); - yyval.InstVal.I = BinaryOperator::create(Opcode, val1, val2); - if (yyval.InstVal.I == 0) + Instruction::BinaryOps Opcode = getBinaryOp((yyvsp[(1) - (5)].BinaryOpVal), Ty, (yyvsp[(2) - (5)].TypeVal).S); + Value* val1 = getVal(Ty, (yyvsp[(3) - (5)].ValIDVal)); + Value* val2 = getVal(Ty, (yyvsp[(5) - (5)].ValIDVal)); + (yyval.InstVal).I = BinaryOperator::create(Opcode, val1, val2); + if ((yyval.InstVal).I == 0) error("binary operator returned null"); - yyval.InstVal.S.copy(yyvsp[-3].TypeVal.S); - delete yyvsp[-3].TypeVal.PAT; - ; - break;} -case 281: -#line 3515 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[-2].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - yyvsp[0].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - const Type *Ty = yyvsp[-3].TypeVal.PAT->get(); + (yyval.InstVal).S.copy((yyvsp[(2) - (5)].TypeVal).S); + delete (yyvsp[(2) - (5)].TypeVal).PAT; + ;} + break; + + case 282: +#line 3438 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(3) - (5)].ValIDVal).S.copy((yyvsp[(2) - (5)].TypeVal).S); + (yyvsp[(5) - (5)].ValIDVal).S.copy((yyvsp[(2) - (5)].TypeVal).S); + const Type *Ty = (yyvsp[(2) - (5)].TypeVal).PAT->get(); if (!Ty->isInteger()) { if (!isa(Ty) || !cast(Ty)->getElementType()->isInteger()) error("Logical operator requires integral operands"); } - Instruction::BinaryOps Opcode = getBinaryOp(yyvsp[-4].BinaryOpVal, Ty, yyvsp[-3].TypeVal.S); - Value* tmpVal1 = getVal(Ty, yyvsp[-2].ValIDVal); - Value* tmpVal2 = getVal(Ty, yyvsp[0].ValIDVal); - yyval.InstVal.I = BinaryOperator::create(Opcode, tmpVal1, tmpVal2); - if (yyval.InstVal.I == 0) + Instruction::BinaryOps Opcode = getBinaryOp((yyvsp[(1) - (5)].BinaryOpVal), Ty, (yyvsp[(2) - (5)].TypeVal).S); + Value* tmpVal1 = getVal(Ty, (yyvsp[(3) - (5)].ValIDVal)); + Value* tmpVal2 = getVal(Ty, (yyvsp[(5) - (5)].ValIDVal)); + (yyval.InstVal).I = BinaryOperator::create(Opcode, tmpVal1, tmpVal2); + if ((yyval.InstVal).I == 0) error("binary operator returned null"); - yyval.InstVal.S.copy(yyvsp[-3].TypeVal.S); - delete yyvsp[-3].TypeVal.PAT; - ; - break;} -case 282: -#line 3533 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[-2].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - yyvsp[0].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - const Type* Ty = yyvsp[-3].TypeVal.PAT->get(); + (yyval.InstVal).S.copy((yyvsp[(2) - (5)].TypeVal).S); + delete (yyvsp[(2) - (5)].TypeVal).PAT; + ;} + break; + + case 283: +#line 3456 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(3) - (5)].ValIDVal).S.copy((yyvsp[(2) - (5)].TypeVal).S); + (yyvsp[(5) - (5)].ValIDVal).S.copy((yyvsp[(2) - (5)].TypeVal).S); + const Type* Ty = (yyvsp[(2) - (5)].TypeVal).PAT->get(); if(isa(Ty)) error("VectorTypes currently not supported in setcc instructions"); unsigned short pred; - Instruction::OtherOps Opcode = getCompareOp(yyvsp[-4].BinaryOpVal, pred, Ty, yyvsp[-3].TypeVal.S); - Value* tmpVal1 = getVal(Ty, yyvsp[-2].ValIDVal); - Value* tmpVal2 = getVal(Ty, yyvsp[0].ValIDVal); - yyval.InstVal.I = CmpInst::create(Opcode, pred, tmpVal1, tmpVal2); - if (yyval.InstVal.I == 0) + Instruction::OtherOps Opcode = getCompareOp((yyvsp[(1) - (5)].BinaryOpVal), pred, Ty, (yyvsp[(2) - (5)].TypeVal).S); + Value* tmpVal1 = getVal(Ty, (yyvsp[(3) - (5)].ValIDVal)); + Value* tmpVal2 = getVal(Ty, (yyvsp[(5) - (5)].ValIDVal)); + (yyval.InstVal).I = CmpInst::create(Opcode, pred, tmpVal1, tmpVal2); + if ((yyval.InstVal).I == 0) error("binary operator returned null"); - yyval.InstVal.S.makeUnsigned(); - delete yyvsp[-3].TypeVal.PAT; - ; - break;} -case 283: -#line 3549 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[-2].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - yyvsp[0].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - const Type *Ty = yyvsp[-3].TypeVal.PAT->get(); + (yyval.InstVal).S.makeUnsigned(); + delete (yyvsp[(2) - (5)].TypeVal).PAT; + ;} + break; + + case 284: +#line 3472 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(4) - (6)].ValIDVal).S.copy((yyvsp[(3) - (6)].TypeVal).S); + (yyvsp[(6) - (6)].ValIDVal).S.copy((yyvsp[(3) - (6)].TypeVal).S); + const Type *Ty = (yyvsp[(3) - (6)].TypeVal).PAT->get(); if (isa(Ty)) error("VectorTypes currently not supported in icmp instructions"); else if (!Ty->isInteger() && !isa(Ty)) error("icmp requires integer or pointer typed operands"); - Value* tmpVal1 = getVal(Ty, yyvsp[-2].ValIDVal); - Value* tmpVal2 = getVal(Ty, yyvsp[0].ValIDVal); - yyval.InstVal.I = new ICmpInst(yyvsp[-4].IPred, tmpVal1, tmpVal2); - yyval.InstVal.S.makeUnsigned(); - delete yyvsp[-3].TypeVal.PAT; - ; - break;} -case 284: -#line 3563 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[-2].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - yyvsp[0].ValIDVal.S.copy(yyvsp[-3].TypeVal.S); - const Type *Ty = yyvsp[-3].TypeVal.PAT->get(); + Value* tmpVal1 = getVal(Ty, (yyvsp[(4) - (6)].ValIDVal)); + Value* tmpVal2 = getVal(Ty, (yyvsp[(6) - (6)].ValIDVal)); + (yyval.InstVal).I = new ICmpInst((yyvsp[(2) - (6)].IPred), tmpVal1, tmpVal2); + (yyval.InstVal).S.makeUnsigned(); + delete (yyvsp[(3) - (6)].TypeVal).PAT; + ;} + break; + + case 285: +#line 3486 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(4) - (6)].ValIDVal).S.copy((yyvsp[(3) - (6)].TypeVal).S); + (yyvsp[(6) - (6)].ValIDVal).S.copy((yyvsp[(3) - (6)].TypeVal).S); + const Type *Ty = (yyvsp[(3) - (6)].TypeVal).PAT->get(); if (isa(Ty)) error("VectorTypes currently not supported in fcmp instructions"); else if (!Ty->isFloatingPoint()) error("fcmp instruction requires floating point operands"); - Value* tmpVal1 = getVal(Ty, yyvsp[-2].ValIDVal); - Value* tmpVal2 = getVal(Ty, yyvsp[0].ValIDVal); - yyval.InstVal.I = new FCmpInst(yyvsp[-4].FPred, tmpVal1, tmpVal2); - yyval.InstVal.S.makeUnsigned(); - delete yyvsp[-3].TypeVal.PAT; - ; - break;} -case 285: -#line 3577 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + Value* tmpVal1 = getVal(Ty, (yyvsp[(4) - (6)].ValIDVal)); + Value* tmpVal2 = getVal(Ty, (yyvsp[(6) - (6)].ValIDVal)); + (yyval.InstVal).I = new FCmpInst((yyvsp[(2) - (6)].FPred), tmpVal1, tmpVal2); + (yyval.InstVal).S.makeUnsigned(); + delete (yyvsp[(3) - (6)].TypeVal).PAT; + ;} + break; + + case 286: +#line 3500 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { warning("Use of obsolete 'not' instruction: Replacing with 'xor"); - const Type *Ty = yyvsp[0].ValueVal.V->getType(); + const Type *Ty = (yyvsp[(2) - (2)].ValueVal).V->getType(); Value *Ones = ConstantInt::getAllOnesValue(Ty); if (Ones == 0) error("Expected integral type for not instruction"); - yyval.InstVal.I = BinaryOperator::create(Instruction::Xor, yyvsp[0].ValueVal.V, Ones); - if (yyval.InstVal.I == 0) + (yyval.InstVal).I = BinaryOperator::create(Instruction::Xor, (yyvsp[(2) - (2)].ValueVal).V, Ones); + if ((yyval.InstVal).I == 0) error("Could not create a xor instruction"); - yyval.InstVal.S.copy(yyvsp[0].ValueVal.S); - ; - break;} -case 286: -#line 3588 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!yyvsp[0].ValueVal.V->getType()->isInteger() || - cast(yyvsp[0].ValueVal.V->getType())->getBitWidth() != 8) + (yyval.InstVal).S.copy((yyvsp[(2) - (2)].ValueVal).S); + ;} + break; + + case 287: +#line 3511 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!(yyvsp[(4) - (4)].ValueVal).V->getType()->isInteger() || + cast((yyvsp[(4) - (4)].ValueVal).V->getType())->getBitWidth() != 8) error("Shift amount must be int8"); - const Type* Ty = yyvsp[-2].ValueVal.V->getType(); + const Type* Ty = (yyvsp[(2) - (4)].ValueVal).V->getType(); if (!Ty->isInteger()) error("Shift constant expression requires integer operand"); Value* ShiftAmt = 0; if (cast(Ty)->getBitWidth() > Type::Int8Ty->getBitWidth()) - if (Constant *C = dyn_cast(yyvsp[0].ValueVal.V)) + if (Constant *C = dyn_cast((yyvsp[(4) - (4)].ValueVal).V)) ShiftAmt = ConstantExpr::getZExt(C, Ty); else - ShiftAmt = new ZExtInst(yyvsp[0].ValueVal.V, Ty, makeNameUnique("shift"), CurBB); + ShiftAmt = new ZExtInst((yyvsp[(4) - (4)].ValueVal).V, Ty, makeNameUnique("shift"), CurBB); else - ShiftAmt = yyvsp[0].ValueVal.V; - yyval.InstVal.I = BinaryOperator::create(getBinaryOp(yyvsp[-3].BinaryOpVal, Ty, yyvsp[-2].ValueVal.S), yyvsp[-2].ValueVal.V, ShiftAmt); - yyval.InstVal.S.copy(yyvsp[-2].ValueVal.S); - ; - break;} -case 287: -#line 3606 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *DstTy = yyvsp[0].TypeVal.PAT->get(); + ShiftAmt = (yyvsp[(4) - (4)].ValueVal).V; + (yyval.InstVal).I = BinaryOperator::create(getBinaryOp((yyvsp[(1) - (4)].BinaryOpVal), Ty, (yyvsp[(2) - (4)].ValueVal).S), (yyvsp[(2) - (4)].ValueVal).V, ShiftAmt); + (yyval.InstVal).S.copy((yyvsp[(2) - (4)].ValueVal).S); + ;} + break; + + case 288: +#line 3529 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *DstTy = (yyvsp[(4) - (4)].TypeVal).PAT->get(); if (!DstTy->isFirstClassType()) error("cast instruction to a non-primitive type: '" + DstTy->getDescription() + "'"); - yyval.InstVal.I = cast(getCast(yyvsp[-3].CastOpVal, yyvsp[-2].ValueVal.V, yyvsp[-2].ValueVal.S, DstTy, yyvsp[0].TypeVal.S, true)); - yyval.InstVal.S.copy(yyvsp[0].TypeVal.S); - delete yyvsp[0].TypeVal.PAT; - ; - break;} -case 288: -#line 3615 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!yyvsp[-4].ValueVal.V->getType()->isInteger() || - cast(yyvsp[-4].ValueVal.V->getType())->getBitWidth() != 1) + (yyval.InstVal).I = cast(getCast((yyvsp[(1) - (4)].CastOpVal), (yyvsp[(2) - (4)].ValueVal).V, (yyvsp[(2) - (4)].ValueVal).S, DstTy, (yyvsp[(4) - (4)].TypeVal).S, true)); + (yyval.InstVal).S.copy((yyvsp[(4) - (4)].TypeVal).S); + delete (yyvsp[(4) - (4)].TypeVal).PAT; + ;} + break; + + case 289: +#line 3538 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!(yyvsp[(2) - (6)].ValueVal).V->getType()->isInteger() || + cast((yyvsp[(2) - (6)].ValueVal).V->getType())->getBitWidth() != 1) error("select condition must be bool"); - if (yyvsp[-2].ValueVal.V->getType() != yyvsp[0].ValueVal.V->getType()) + if ((yyvsp[(4) - (6)].ValueVal).V->getType() != (yyvsp[(6) - (6)].ValueVal).V->getType()) error("select value types should match"); - yyval.InstVal.I = new SelectInst(yyvsp[-4].ValueVal.V, yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V); - yyval.InstVal.S.copy(yyvsp[-2].ValueVal.S); - ; - break;} -case 289: -#line 3624 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[0].TypeVal.PAT->get(); + (yyval.InstVal).I = new SelectInst((yyvsp[(2) - (6)].ValueVal).V, (yyvsp[(4) - (6)].ValueVal).V, (yyvsp[(6) - (6)].ValueVal).V); + (yyval.InstVal).S.copy((yyvsp[(4) - (6)].ValueVal).S); + ;} + break; + + case 290: +#line 3547 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(4) - (4)].TypeVal).PAT->get(); NewVarArgs = true; - yyval.InstVal.I = new VAArgInst(yyvsp[-2].ValueVal.V, Ty); - yyval.InstVal.S.copy(yyvsp[0].TypeVal.S); - delete yyvsp[0].TypeVal.PAT; - ; - break;} -case 290: -#line 3631 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type* ArgTy = yyvsp[-2].ValueVal.V->getType(); - const Type* DstTy = yyvsp[0].TypeVal.PAT->get(); + (yyval.InstVal).I = new VAArgInst((yyvsp[(2) - (4)].ValueVal).V, Ty); + (yyval.InstVal).S.copy((yyvsp[(4) - (4)].TypeVal).S); + delete (yyvsp[(4) - (4)].TypeVal).PAT; + ;} + break; + + case 291: +#line 3554 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type* ArgTy = (yyvsp[(2) - (4)].ValueVal).V->getType(); + const Type* DstTy = (yyvsp[(4) - (4)].TypeVal).PAT->get(); ObsoleteVarArgs = true; Function* NF = cast(CurModule.CurrentModule-> getOrInsertFunction("llvm.va_copy", ArgTy, ArgTy, (Type *)0)); @@ -5423,19 +6433,20 @@ case 290: //b = vaarg foo, t AllocaInst* foo = new AllocaInst(ArgTy, 0, "vaarg.fix"); CurBB->getInstList().push_back(foo); - CallInst* bar = new CallInst(NF, yyvsp[-2].ValueVal.V); + CallInst* bar = new CallInst(NF, (yyvsp[(2) - (4)].ValueVal).V); CurBB->getInstList().push_back(bar); CurBB->getInstList().push_back(new StoreInst(bar, foo)); - yyval.InstVal.I = new VAArgInst(foo, DstTy); - yyval.InstVal.S.copy(yyvsp[0].TypeVal.S); - delete yyvsp[0].TypeVal.PAT; - ; - break;} -case 291: -#line 3652 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type* ArgTy = yyvsp[-2].ValueVal.V->getType(); - const Type* DstTy = yyvsp[0].TypeVal.PAT->get(); + (yyval.InstVal).I = new VAArgInst(foo, DstTy); + (yyval.InstVal).S.copy((yyvsp[(4) - (4)].TypeVal).S); + delete (yyvsp[(4) - (4)].TypeVal).PAT; + ;} + break; + + case 292: +#line 3575 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type* ArgTy = (yyvsp[(2) - (4)].ValueVal).V->getType(); + const Type* DstTy = (yyvsp[(4) - (4)].TypeVal).PAT->get(); ObsoleteVarArgs = true; Function* NF = cast(CurModule.CurrentModule-> getOrInsertFunction("llvm.va_copy", ArgTy, ArgTy, (Type *)0)); @@ -5448,76 +6459,81 @@ case 291: //b = load foo AllocaInst* foo = new AllocaInst(ArgTy, 0, "vanext.fix"); CurBB->getInstList().push_back(foo); - CallInst* bar = new CallInst(NF, yyvsp[-2].ValueVal.V); + CallInst* bar = new CallInst(NF, (yyvsp[(2) - (4)].ValueVal).V); CurBB->getInstList().push_back(bar); CurBB->getInstList().push_back(new StoreInst(bar, foo)); Instruction* tmp = new VAArgInst(foo, DstTy); CurBB->getInstList().push_back(tmp); - yyval.InstVal.I = new LoadInst(foo); - yyval.InstVal.S.copy(yyvsp[0].TypeVal.S); - delete yyvsp[0].TypeVal.PAT; - ; - break;} -case 292: -#line 3676 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!ExtractElementInst::isValidOperands(yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V)) + (yyval.InstVal).I = new LoadInst(foo); + (yyval.InstVal).S.copy((yyvsp[(4) - (4)].TypeVal).S); + delete (yyvsp[(4) - (4)].TypeVal).PAT; + ;} + break; + + case 293: +#line 3599 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal).V, (yyvsp[(4) - (4)].ValueVal).V)) error("Invalid extractelement operands"); - yyval.InstVal.I = new ExtractElementInst(yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V); - yyval.InstVal.S.copy(yyvsp[-2].ValueVal.S.get(0)); - ; - break;} -case 293: -#line 3682 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!InsertElementInst::isValidOperands(yyvsp[-4].ValueVal.V, yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V)) + (yyval.InstVal).I = new ExtractElementInst((yyvsp[(2) - (4)].ValueVal).V, (yyvsp[(4) - (4)].ValueVal).V); + (yyval.InstVal).S.copy((yyvsp[(2) - (4)].ValueVal).S.get(0)); + ;} + break; + + case 294: +#line 3605 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!InsertElementInst::isValidOperands((yyvsp[(2) - (6)].ValueVal).V, (yyvsp[(4) - (6)].ValueVal).V, (yyvsp[(6) - (6)].ValueVal).V)) error("Invalid insertelement operands"); - yyval.InstVal.I = new InsertElementInst(yyvsp[-4].ValueVal.V, yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V); - yyval.InstVal.S.copy(yyvsp[-4].ValueVal.S); - ; - break;} -case 294: -#line 3688 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - if (!ShuffleVectorInst::isValidOperands(yyvsp[-4].ValueVal.V, yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V)) + (yyval.InstVal).I = new InsertElementInst((yyvsp[(2) - (6)].ValueVal).V, (yyvsp[(4) - (6)].ValueVal).V, (yyvsp[(6) - (6)].ValueVal).V); + (yyval.InstVal).S.copy((yyvsp[(2) - (6)].ValueVal).S); + ;} + break; + + case 295: +#line 3611 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + if (!ShuffleVectorInst::isValidOperands((yyvsp[(2) - (6)].ValueVal).V, (yyvsp[(4) - (6)].ValueVal).V, (yyvsp[(6) - (6)].ValueVal).V)) error("Invalid shufflevector operands"); - yyval.InstVal.I = new ShuffleVectorInst(yyvsp[-4].ValueVal.V, yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V); - yyval.InstVal.S.copy(yyvsp[-4].ValueVal.S); - ; - break;} -case 295: -#line 3694 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[0].PHIList.P->front().first->getType(); + (yyval.InstVal).I = new ShuffleVectorInst((yyvsp[(2) - (6)].ValueVal).V, (yyvsp[(4) - (6)].ValueVal).V, (yyvsp[(6) - (6)].ValueVal).V); + (yyval.InstVal).S.copy((yyvsp[(2) - (6)].ValueVal).S); + ;} + break; + + case 296: +#line 3617 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(2) - (2)].PHIList).P->front().first->getType(); if (!Ty->isFirstClassType()) error("PHI node operands must be of first class type"); PHINode *PHI = new PHINode(Ty); - PHI->reserveOperandSpace(yyvsp[0].PHIList.P->size()); - while (yyvsp[0].PHIList.P->begin() != yyvsp[0].PHIList.P->end()) { - if (yyvsp[0].PHIList.P->front().first->getType() != Ty) + PHI->reserveOperandSpace((yyvsp[(2) - (2)].PHIList).P->size()); + while ((yyvsp[(2) - (2)].PHIList).P->begin() != (yyvsp[(2) - (2)].PHIList).P->end()) { + if ((yyvsp[(2) - (2)].PHIList).P->front().first->getType() != Ty) error("All elements of a PHI node must be of the same type"); - PHI->addIncoming(yyvsp[0].PHIList.P->front().first, yyvsp[0].PHIList.P->front().second); - yyvsp[0].PHIList.P->pop_front(); + PHI->addIncoming((yyvsp[(2) - (2)].PHIList).P->front().first, (yyvsp[(2) - (2)].PHIList).P->front().second); + (yyvsp[(2) - (2)].PHIList).P->pop_front(); } - yyval.InstVal.I = PHI; - yyval.InstVal.S.copy(yyvsp[0].PHIList.S); - delete yyvsp[0].PHIList.P; // Free the list... - ; - break;} -case 296: -#line 3710 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ + (yyval.InstVal).I = PHI; + (yyval.InstVal).S.copy((yyvsp[(2) - (2)].PHIList).S); + delete (yyvsp[(2) - (2)].PHIList).P; // Free the list... + ;} + break; + + case 297: +#line 3633 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { // Handle the short call syntax const PointerType *PFTy; const FunctionType *FTy; Signedness FTySign; - if (!(PFTy = dyn_cast(yyvsp[-4].TypeVal.PAT->get())) || + if (!(PFTy = dyn_cast((yyvsp[(3) - (7)].TypeVal).PAT->get())) || !(FTy = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; - FTySign.makeComposite(yyvsp[-4].TypeVal.S); - if (yyvsp[-1].ValueList) { - for (std::vector::iterator I = yyvsp[-1].ValueList->begin(), E = yyvsp[-1].ValueList->end(); + FTySign.makeComposite((yyvsp[(3) - (7)].TypeVal).S); + if ((yyvsp[(6) - (7)].ValueList)) { + for (std::vector::iterator I = (yyvsp[(6) - (7)].ValueList)->begin(), E = (yyvsp[(6) - (7)].ValueList)->end(); I != E; ++I) { ParamTypes.push_back((*I).V->getType()); FTySign.add(I->S); @@ -5527,48 +6543,38 @@ case 296: bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy; if (isVarArg) ParamTypes.pop_back(); - const Type *RetTy = yyvsp[-4].TypeVal.PAT->get(); + const Type *RetTy = (yyvsp[(3) - (7)].TypeVal).PAT->get(); if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy) error("Functions cannot return aggregate types"); - // Deal with CSRetCC - ParamAttrsList *PAL = 0; - if (yyvsp[-5].UIntVal == OldCallingConv::CSRet) { - ParamAttrsVector Attrs; - ParamAttrsWithIndex PAWI; - PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg - Attrs.push_back(PAWI); - PAL = ParamAttrsList::get(Attrs); - } - - FTy = FunctionType::get(RetTy, ParamTypes, isVarArg, PAL); + FTy = FunctionType::get(RetTy, ParamTypes, isVarArg); PFTy = PointerType::get(FTy); - yyval.InstVal.S.copy(yyvsp[-4].TypeVal.S); + (yyval.InstVal).S.copy((yyvsp[(3) - (7)].TypeVal).S); } else { - FTySign = yyvsp[-4].TypeVal.S; + FTySign = (yyvsp[(3) - (7)].TypeVal).S; // Get the signedness of the result type. $3 is the pointer to the // function type so we get the 0th element to extract the function type, // and then the 0th element again to get the result type. - yyval.InstVal.S.copy(yyvsp[-4].TypeVal.S.get(0).get(0)); + (yyval.InstVal).S.copy((yyvsp[(3) - (7)].TypeVal).S.get(0).get(0)); } - yyvsp[-3].ValIDVal.S.makeComposite(FTySign); + (yyvsp[(4) - (7)].ValIDVal).S.makeComposite(FTySign); // First upgrade any intrinsic calls. std::vector Args; - if (yyvsp[-1].ValueList) - for (unsigned i = 0, e = yyvsp[-1].ValueList->size(); i < e; ++i) - Args.push_back((*yyvsp[-1].ValueList)[i].V); - Instruction *Inst = upgradeIntrinsicCall(FTy->getReturnType(), yyvsp[-3].ValIDVal, Args); + if ((yyvsp[(6) - (7)].ValueList)) + for (unsigned i = 0, e = (yyvsp[(6) - (7)].ValueList)->size(); i < e; ++i) + Args.push_back((*(yyvsp[(6) - (7)].ValueList))[i].V); + Instruction *Inst = upgradeIntrinsicCall(FTy->getReturnType(), (yyvsp[(4) - (7)].ValIDVal), Args); // If we got an upgraded intrinsic if (Inst) { - yyval.InstVal.I = Inst; + (yyval.InstVal).I = Inst; } else { // Get the function we're calling - Value *V = getVal(PFTy, yyvsp[-3].ValIDVal); + Value *V = getVal(PFTy, (yyvsp[(4) - (7)].ValIDVal)); // Check the argument values match - if (!yyvsp[-1].ValueList) { // Has no arguments? + if (!(yyvsp[(6) - (7)].ValueList)) { // Has no arguments? // Make sure no arguments is a good thing! if (FTy->getNumParams() != 0) error("No arguments passed to a function that expects arguments"); @@ -5578,7 +6584,7 @@ case 296: // FunctionType::param_iterator I = FTy->param_begin(); FunctionType::param_iterator E = FTy->param_end(); - std::vector::iterator ArgI = yyvsp[-1].ValueList->begin(), ArgE = yyvsp[-1].ValueList->end(); + std::vector::iterator ArgI = (yyvsp[(6) - (7)].ValueList)->begin(), ArgE = (yyvsp[(6) - (7)].ValueList)->end(); for (; ArgI != ArgE && I != E; ++ArgI, ++I) if ((*ArgI).V->getType() != *I) @@ -5591,372 +6597,383 @@ case 296: // Create the call instruction CallInst *CI = new CallInst(V, Args.begin(), Args.end()); - CI->setTailCall(yyvsp[-6].BoolVal); - CI->setCallingConv(upgradeCallingConv(yyvsp[-5].UIntVal)); - yyval.InstVal.I = CI; + CI->setTailCall((yyvsp[(1) - (7)].BoolVal)); + CI->setCallingConv(upgradeCallingConv((yyvsp[(2) - (7)].UIntVal))); + + (yyval.InstVal).I = CI; } - delete yyvsp[-4].TypeVal.PAT; - delete yyvsp[-1].ValueList; + // Deal with CSRetCC + if ((yyvsp[(2) - (7)].UIntVal) == OldCallingConv::CSRet) { + ParamAttrsVector Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg + Attrs.push_back(PAWI); + cast((yyval.InstVal).I)->setParamAttrs(ParamAttrsList::get(Attrs)); + } + delete (yyvsp[(3) - (7)].TypeVal).PAT; + delete (yyvsp[(6) - (7)].ValueList); lastCallingConv = OldCallingConv::C; - ; - break;} -case 297: -#line 3803 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyval.InstVal = yyvsp[0].InstVal; - ; - break;} -case 298: -#line 3811 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValueList = yyvsp[0].ValueList; ; - break;} -case 299: -#line 3812 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.ValueList = new std::vector(); ; - break;} -case 300: -#line 3816 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.BoolVal = true; ; - break;} -case 301: -#line 3817 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ yyval.BoolVal = false; ; - break;} -case 302: -#line 3821 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[-1].TypeVal.PAT->get(); - yyval.InstVal.S.makeComposite(yyvsp[-1].TypeVal.S); - yyval.InstVal.I = new MallocInst(Ty, 0, yyvsp[0].UIntVal); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 303: -#line 3827 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[-4].TypeVal.PAT->get(); - yyvsp[-1].ValIDVal.S.makeUnsigned(); - yyval.InstVal.S.makeComposite(yyvsp[-4].TypeVal.S); - yyval.InstVal.I = new MallocInst(Ty, getVal(yyvsp[-2].PrimType.T, yyvsp[-1].ValIDVal), yyvsp[0].UIntVal); - delete yyvsp[-4].TypeVal.PAT; - ; - break;} -case 304: -#line 3834 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[-1].TypeVal.PAT->get(); - yyval.InstVal.S.makeComposite(yyvsp[-1].TypeVal.S); - yyval.InstVal.I = new AllocaInst(Ty, 0, yyvsp[0].UIntVal); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 305: -#line 3840 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *Ty = yyvsp[-4].TypeVal.PAT->get(); - yyvsp[-1].ValIDVal.S.makeUnsigned(); - yyval.InstVal.S.makeComposite(yyvsp[-2].PrimType.S); - yyval.InstVal.I = new AllocaInst(Ty, getVal(yyvsp[-2].PrimType.T, yyvsp[-1].ValIDVal), yyvsp[0].UIntVal); - delete yyvsp[-4].TypeVal.PAT; - ; - break;} -case 306: -#line 3847 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type *PTy = yyvsp[0].ValueVal.V->getType(); + ;} + break; + + case 298: +#line 3725 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal); + ;} + break; + + case 299: +#line 3733 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValueList) = (yyvsp[(2) - (2)].ValueList); ;} + break; + + case 300: +#line 3734 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.ValueList) = new std::vector(); ;} + break; + + case 301: +#line 3738 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.BoolVal) = true; ;} + break; + + case 302: +#line 3739 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.BoolVal) = false; ;} + break; + + case 303: +#line 3743 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(2) - (3)].TypeVal).PAT->get(); + (yyval.InstVal).S.makeComposite((yyvsp[(2) - (3)].TypeVal).S); + (yyval.InstVal).I = new MallocInst(Ty, 0, (yyvsp[(3) - (3)].UIntVal)); + delete (yyvsp[(2) - (3)].TypeVal).PAT; + ;} + break; + + case 304: +#line 3749 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(2) - (6)].TypeVal).PAT->get(); + (yyvsp[(5) - (6)].ValIDVal).S.makeUnsigned(); + (yyval.InstVal).S.makeComposite((yyvsp[(2) - (6)].TypeVal).S); + (yyval.InstVal).I = new MallocInst(Ty, getVal((yyvsp[(4) - (6)].PrimType).T, (yyvsp[(5) - (6)].ValIDVal)), (yyvsp[(6) - (6)].UIntVal)); + delete (yyvsp[(2) - (6)].TypeVal).PAT; + ;} + break; + + case 305: +#line 3756 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(2) - (3)].TypeVal).PAT->get(); + (yyval.InstVal).S.makeComposite((yyvsp[(2) - (3)].TypeVal).S); + (yyval.InstVal).I = new AllocaInst(Ty, 0, (yyvsp[(3) - (3)].UIntVal)); + delete (yyvsp[(2) - (3)].TypeVal).PAT; + ;} + break; + + case 306: +#line 3762 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *Ty = (yyvsp[(2) - (6)].TypeVal).PAT->get(); + (yyvsp[(5) - (6)].ValIDVal).S.makeUnsigned(); + (yyval.InstVal).S.makeComposite((yyvsp[(4) - (6)].PrimType).S); + (yyval.InstVal).I = new AllocaInst(Ty, getVal((yyvsp[(4) - (6)].PrimType).T, (yyvsp[(5) - (6)].ValIDVal)), (yyvsp[(6) - (6)].UIntVal)); + delete (yyvsp[(2) - (6)].TypeVal).PAT; + ;} + break; + + case 307: +#line 3769 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type *PTy = (yyvsp[(2) - (2)].ValueVal).V->getType(); if (!isa(PTy)) error("Trying to free nonpointer type '" + PTy->getDescription() + "'"); - yyval.InstVal.I = new FreeInst(yyvsp[0].ValueVal.V); - yyval.InstVal.S.makeSignless(); - ; - break;} -case 307: -#line 3854 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - const Type* Ty = yyvsp[-1].TypeVal.PAT->get(); - yyvsp[0].ValIDVal.S.copy(yyvsp[-1].TypeVal.S); + (yyval.InstVal).I = new FreeInst((yyvsp[(2) - (2)].ValueVal).V); + (yyval.InstVal).S.makeSignless(); + ;} + break; + + case 308: +#line 3776 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + const Type* Ty = (yyvsp[(3) - (4)].TypeVal).PAT->get(); + (yyvsp[(4) - (4)].ValIDVal).S.copy((yyvsp[(3) - (4)].TypeVal).S); if (!isa(Ty)) error("Can't load from nonpointer type: " + Ty->getDescription()); if (!cast(Ty)->getElementType()->isFirstClassType()) error("Can't load from pointer of non-first-class type: " + Ty->getDescription()); - Value* tmpVal = getVal(Ty, yyvsp[0].ValIDVal); - yyval.InstVal.I = new LoadInst(tmpVal, "", yyvsp[-3].BoolVal); - yyval.InstVal.S.copy(yyvsp[-1].TypeVal.S.get(0)); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 308: -#line 3867 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[0].ValIDVal.S.copy(yyvsp[-1].TypeVal.S); - const PointerType *PTy = dyn_cast(yyvsp[-1].TypeVal.PAT->get()); + Value* tmpVal = getVal(Ty, (yyvsp[(4) - (4)].ValIDVal)); + (yyval.InstVal).I = new LoadInst(tmpVal, "", (yyvsp[(1) - (4)].BoolVal)); + (yyval.InstVal).S.copy((yyvsp[(3) - (4)].TypeVal).S.get(0)); + delete (yyvsp[(3) - (4)].TypeVal).PAT; + ;} + break; + + case 309: +#line 3789 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(6) - (6)].ValIDVal).S.copy((yyvsp[(5) - (6)].TypeVal).S); + const PointerType *PTy = dyn_cast((yyvsp[(5) - (6)].TypeVal).PAT->get()); if (!PTy) error("Can't store to a nonpointer type: " + - yyvsp[-1].TypeVal.PAT->get()->getDescription()); + (yyvsp[(5) - (6)].TypeVal).PAT->get()->getDescription()); const Type *ElTy = PTy->getElementType(); - Value *StoreVal = yyvsp[-3].ValueVal.V; - Value* tmpVal = getVal(PTy, yyvsp[0].ValIDVal); - if (ElTy != yyvsp[-3].ValueVal.V->getType()) { - StoreVal = handleSRetFuncTypeMerge(yyvsp[-3].ValueVal.V, ElTy); - if (!StoreVal) - error("Can't store '" + yyvsp[-3].ValueVal.V->getType()->getDescription() + - "' into space of type '" + ElTy->getDescription() + "'"); - else { - PTy = PointerType::get(StoreVal->getType()); - if (Constant *C = dyn_cast(tmpVal)) - tmpVal = ConstantExpr::getBitCast(C, PTy); - else - tmpVal = new BitCastInst(tmpVal, PTy, "upgrd.cast", CurBB); - } + Value *StoreVal = (yyvsp[(3) - (6)].ValueVal).V; + Value* tmpVal = getVal(PTy, (yyvsp[(6) - (6)].ValIDVal)); + if (ElTy != (yyvsp[(3) - (6)].ValueVal).V->getType()) { + PTy = PointerType::get(StoreVal->getType()); + if (Constant *C = dyn_cast(tmpVal)) + tmpVal = ConstantExpr::getBitCast(C, PTy); + else + tmpVal = new BitCastInst(tmpVal, PTy, "upgrd.cast", CurBB); } - yyval.InstVal.I = new StoreInst(StoreVal, tmpVal, yyvsp[-5].BoolVal); - yyval.InstVal.S.makeSignless(); - delete yyvsp[-1].TypeVal.PAT; - ; - break;} -case 309: -#line 3893 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" -{ - yyvsp[-1].ValIDVal.S.copy(yyvsp[-2].TypeVal.S); - const Type* Ty = yyvsp[-2].TypeVal.PAT->get(); + (yyval.InstVal).I = new StoreInst(StoreVal, tmpVal, (yyvsp[(1) - (6)].BoolVal)); + (yyval.InstVal).S.makeSignless(); + delete (yyvsp[(5) - (6)].TypeVal).PAT; + ;} + break; + + case 310: +#line 3809 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" + { + (yyvsp[(3) - (4)].ValIDVal).S.copy((yyvsp[(2) - (4)].TypeVal).S); + const Type* Ty = (yyvsp[(2) - (4)].TypeVal).PAT->get(); if (!isa(Ty)) error("getelementptr insn requires pointer operand"); std::vector VIndices; - upgradeGEPInstIndices(Ty, yyvsp[0].ValueList, VIndices); - - Value* tmpVal = getVal(Ty, yyvsp[-1].ValIDVal); - yyval.InstVal.I = new GetElementPtrInst(tmpVal, VIndices.begin(), VIndices.end()); - ValueInfo VI; VI.V = tmpVal; VI.S.copy(yyvsp[-2].TypeVal.S); - yyval.InstVal.S.copy(getElementSign(VI, VIndices)); - delete yyvsp[-2].TypeVal.PAT; - delete yyvsp[0].ValueList; - ; - break;} -} - /* the action file gets copied in in place of this dollarsign */ -#line 543 "/usr/share/bison.simple" - - yyvsp -= yylen; - yyssp -= yylen; -#ifdef YYLSP_NEEDED - yylsp -= yylen; -#endif + upgradeGEPInstIndices(Ty, (yyvsp[(4) - (4)].ValueList), VIndices); + + Value* tmpVal = getVal(Ty, (yyvsp[(3) - (4)].ValIDVal)); + (yyval.InstVal).I = new GetElementPtrInst(tmpVal, VIndices.begin(), VIndices.end()); + ValueInfo VI; VI.V = tmpVal; VI.S.copy((yyvsp[(2) - (4)].TypeVal).S); + (yyval.InstVal).S.copy(getElementSign(VI, VIndices)); + delete (yyvsp[(2) - (4)].TypeVal).PAT; + delete (yyvsp[(4) - (4)].ValueList); + ;} + break; -#if YYDEBUG != 0 - if (yydebug) - { - short *ssp1 = yyss - 1; - fprintf (stderr, "state stack now"); - while (ssp1 != yyssp) - fprintf (stderr, " %d", *++ssp1); - fprintf (stderr, "\n"); + +/* Line 1267 of yacc.c. */ +#line 6763 "UpgradeParser.tab.c" + default: break; } -#endif + YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; -#ifdef YYLSP_NEEDED - yylsp++; - if (yylen == 0) - { - yylsp->first_line = yylloc.first_line; - yylsp->first_column = yylloc.first_column; - yylsp->last_line = (yylsp-1)->last_line; - yylsp->last_column = (yylsp-1)->last_column; - yylsp->text = 0; - } - else - { - yylsp->last_line = (yylsp+yylen-1)->last_line; - yylsp->last_column = (yylsp+yylen-1)->last_column; - } -#endif - /* Now "shift" the result of the reduction. - Determine what state that goes to, - based on the state we popped back to - and the rule number reduced by. */ + /* Now `shift' the result of the reduction. Determine what state + that goes to, based on the state we popped back to and the rule + number reduced by. */ yyn = yyr1[yyn]; - yystate = yypgoto[yyn - YYNTBASE] + *yyssp; - if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp) + yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; + if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) yystate = yytable[yystate]; else - yystate = yydefgoto[yyn - YYNTBASE]; + yystate = yydefgoto[yyn - YYNTOKENS]; goto yynewstate; -yyerrlab: /* here on detecting error */ - if (! yyerrstatus) - /* If not already recovering from an error, report this error. */ +/*------------------------------------. +| yyerrlab -- here on detecting error | +`------------------------------------*/ +yyerrlab: + /* If not already recovering from an error, report this error. */ + if (!yyerrstatus) { ++yynerrs; - -#ifdef YYERROR_VERBOSE - yyn = yypact[yystate]; - - if (yyn > YYFLAG && yyn < YYLAST) - { - int size = 0; - char *msg; - int x, count; - - count = 0; - /* Start X at -yyn if nec to avoid negative indexes in yycheck. */ - for (x = (yyn < 0 ? -yyn : 0); - x < (sizeof(yytname) / sizeof(char *)); x++) - if (yycheck[x + yyn] == x) - size += strlen(yytname[x]) + 15, count++; - msg = (char *) malloc(size + 15); - if (msg != 0) - { - strcpy(msg, "parse error"); - - if (count < 5) - { - count = 0; - for (x = (yyn < 0 ? -yyn : 0); - x < (sizeof(yytname) / sizeof(char *)); x++) - if (yycheck[x + yyn] == x) - { - strcat(msg, count == 0 ? ", expecting `" : " or `"); - strcat(msg, yytname[x]); - strcat(msg, "'"); - count++; - } - } - yyerror(msg); - free(msg); - } - else - yyerror ("parse error; also virtual memory exceeded"); - } - else -#endif /* YYERROR_VERBOSE */ - yyerror("parse error"); +#if ! YYERROR_VERBOSE + yyerror (YY_("syntax error")); +#else + { + YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); + if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) + { + YYSIZE_T yyalloc = 2 * yysize; + if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) + yyalloc = YYSTACK_ALLOC_MAXIMUM; + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yyalloc); + if (yymsg) + yymsg_alloc = yyalloc; + else + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + } + } + + if (0 < yysize && yysize <= yymsg_alloc) + { + (void) yysyntax_error (yymsg, yystate, yychar); + yyerror (yymsg); + } + else + { + yyerror (YY_("syntax error")); + if (yysize != 0) + goto yyexhaustedlab; + } + } +#endif } - goto yyerrlab1; -yyerrlab1: /* here on error raised explicitly by an action */ + if (yyerrstatus == 3) { - /* if just tried and failed to reuse lookahead token after an error, discard it. */ - - /* return failure if at end of input */ - if (yychar == YYEOF) - YYABORT; - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]); -#endif + /* If just tried and failed to reuse look-ahead token after an + error, discard it. */ - yychar = YYEMPTY; + if (yychar <= YYEOF) + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } + else + { + yydestruct ("Error: discarding", + yytoken, &yylval); + yychar = YYEMPTY; + } } - /* Else will try to reuse lookahead token - after shifting the error token. */ + /* Else will try to reuse look-ahead token after shifting the error + token. */ + goto yyerrlab1; - yyerrstatus = 3; /* Each real token shifted decrements this */ - goto yyerrhandle; +/*---------------------------------------------------. +| yyerrorlab -- error raised explicitly by YYERROR. | +`---------------------------------------------------*/ +yyerrorlab: -yyerrdefault: /* current state does not do anything special for the error token. */ + /* Pacify compilers like GCC when the user code never invokes + YYERROR and the label yyerrorlab therefore never appears in user + code. */ + if (/*CONSTCOND*/ 0) + goto yyerrorlab; -#if 0 - /* This is wrong; only states that explicitly want error tokens - should shift them. */ - yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/ - if (yyn) goto yydefault; -#endif + /* Do not reclaim the symbols of the rule which action triggered + this YYERROR. */ + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); + yystate = *yyssp; + goto yyerrlab1; -yyerrpop: /* pop the current state because it cannot handle the error token */ - if (yyssp == yyss) YYABORT; - yyvsp--; - yystate = *--yyssp; -#ifdef YYLSP_NEEDED - yylsp--; -#endif +/*-------------------------------------------------------------. +| yyerrlab1 -- common code for both syntax error and YYERROR. | +`-------------------------------------------------------------*/ +yyerrlab1: + yyerrstatus = 3; /* Each real token shifted decrements this. */ -#if YYDEBUG != 0 - if (yydebug) + for (;;) { - short *ssp1 = yyss - 1; - fprintf (stderr, "Error: state stack now"); - while (ssp1 != yyssp) - fprintf (stderr, " %d", *++ssp1); - fprintf (stderr, "\n"); - } -#endif - -yyerrhandle: + yyn = yypact[yystate]; + if (yyn != YYPACT_NINF) + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } - yyn = yypact[yystate]; - if (yyn == YYFLAG) - goto yyerrdefault; + /* Pop the current state because it cannot handle the error token. */ + if (yyssp == yyss) + YYABORT; - yyn += YYTERROR; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR) - goto yyerrdefault; - yyn = yytable[yyn]; - if (yyn < 0) - { - if (yyn == YYFLAG) - goto yyerrpop; - yyn = -yyn; - goto yyreduce; + yydestruct ("Error: popping", + yystos[yystate], yyvsp); + YYPOPSTACK (1); + yystate = *yyssp; + YY_STACK_PRINT (yyss, yyssp); } - else if (yyn == 0) - goto yyerrpop; if (yyn == YYFINAL) YYACCEPT; -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Shifting error token, "); -#endif - *++yyvsp = yylval; -#ifdef YYLSP_NEEDED - *++yylsp = yylloc; -#endif + + + /* Shift the error token. */ + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); yystate = yyn; goto yynewstate; - yyacceptlab: - /* YYACCEPT comes here. */ - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -#ifdef YYLSP_NEEDED - free (yyls); + +/*-------------------------------------. +| yyacceptlab -- YYACCEPT comes here. | +`-------------------------------------*/ +yyacceptlab: + yyresult = 0; + goto yyreturn; + +/*-----------------------------------. +| yyabortlab -- YYABORT comes here. | +`-----------------------------------*/ +yyabortlab: + yyresult = 1; + goto yyreturn; + +#ifndef yyoverflow +/*-------------------------------------------------. +| yyexhaustedlab -- memory exhaustion comes here. | +`-------------------------------------------------*/ +yyexhaustedlab: + yyerror (YY_("memory exhausted")); + yyresult = 2; + /* Fall through. */ #endif - } - return 0; - yyabortlab: - /* YYABORT comes here. */ - if (yyfree_stacks) +yyreturn: + if (yychar != YYEOF && yychar != YYEMPTY) + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval); + /* Do not reclaim the symbols of the rule which action triggered + this YYABORT or YYACCEPT. */ + YYPOPSTACK (yylen); + YY_STACK_PRINT (yyss, yyssp); + while (yyssp != yyss) { - free (yyss); - free (yyvs); -#ifdef YYLSP_NEEDED - free (yyls); -#endif + yydestruct ("Cleanup: popping", + yystos[*yyssp], yyvsp); + YYPOPSTACK (1); } - return 1; +#ifndef yyoverflow + if (yyss != yyssa) + YYSTACK_FREE (yyss); +#endif +#if YYERROR_VERBOSE + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); +#endif + /* Make sure YYID is used. */ + return YYID (yyresult); } -#line 3911 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeParser.y" + + +#line 3827 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" int yyerror(const char *ErrorMsg) { @@ -5989,3 +7006,4 @@ void error(const std::string& ErrorMsg, int LineNo) { yyerror(ErrorMsg.c_str()); } + diff --git a/tools/llvm-upgrade/UpgradeParser.h.cvs b/tools/llvm-upgrade/UpgradeParser.h.cvs index 6bacf8ee458..4460a554a1c 100644 --- a/tools/llvm-upgrade/UpgradeParser.h.cvs +++ b/tools/llvm-upgrade/UpgradeParser.h.cvs @@ -1,4 +1,353 @@ -typedef union { +/* A Bison parser, made by GNU Bison 2.3. */ + +/* Skeleton interface for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ + +/* As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + ESINT64VAL = 258, + EUINT64VAL = 259, + SINTVAL = 260, + UINTVAL = 261, + FPVAL = 262, + VOID = 263, + BOOL = 264, + SBYTE = 265, + UBYTE = 266, + SHORT = 267, + USHORT = 268, + INT = 269, + UINT = 270, + LONG = 271, + ULONG = 272, + FLOAT = 273, + DOUBLE = 274, + TYPE = 275, + LABEL = 276, + VAR_ID = 277, + LABELSTR = 278, + STRINGCONSTANT = 279, + IMPLEMENTATION = 280, + ZEROINITIALIZER = 281, + TRUETOK = 282, + FALSETOK = 283, + BEGINTOK = 284, + ENDTOK = 285, + DECLARE = 286, + GLOBAL = 287, + CONSTANT = 288, + SECTION = 289, + VOLATILE = 290, + TO = 291, + DOTDOTDOT = 292, + NULL_TOK = 293, + UNDEF = 294, + CONST = 295, + INTERNAL = 296, + LINKONCE = 297, + WEAK = 298, + APPENDING = 299, + DLLIMPORT = 300, + DLLEXPORT = 301, + EXTERN_WEAK = 302, + OPAQUE = 303, + NOT = 304, + EXTERNAL = 305, + TARGET = 306, + TRIPLE = 307, + ENDIAN = 308, + POINTERSIZE = 309, + LITTLE = 310, + BIG = 311, + ALIGN = 312, + DEPLIBS = 313, + CALL = 314, + TAIL = 315, + ASM_TOK = 316, + MODULE = 317, + SIDEEFFECT = 318, + CC_TOK = 319, + CCC_TOK = 320, + CSRETCC_TOK = 321, + FASTCC_TOK = 322, + COLDCC_TOK = 323, + X86_STDCALLCC_TOK = 324, + X86_FASTCALLCC_TOK = 325, + DATALAYOUT = 326, + RET = 327, + BR = 328, + SWITCH = 329, + INVOKE = 330, + UNREACHABLE = 331, + UNWIND = 332, + EXCEPT = 333, + ADD = 334, + SUB = 335, + MUL = 336, + DIV = 337, + UDIV = 338, + SDIV = 339, + FDIV = 340, + REM = 341, + UREM = 342, + SREM = 343, + FREM = 344, + AND = 345, + OR = 346, + XOR = 347, + SHL = 348, + SHR = 349, + ASHR = 350, + LSHR = 351, + SETLE = 352, + SETGE = 353, + SETLT = 354, + SETGT = 355, + SETEQ = 356, + SETNE = 357, + ICMP = 358, + FCMP = 359, + MALLOC = 360, + ALLOCA = 361, + FREE = 362, + LOAD = 363, + STORE = 364, + GETELEMENTPTR = 365, + PHI_TOK = 366, + SELECT = 367, + VAARG = 368, + EXTRACTELEMENT = 369, + INSERTELEMENT = 370, + SHUFFLEVECTOR = 371, + VAARG_old = 372, + VANEXT_old = 373, + EQ = 374, + NE = 375, + SLT = 376, + SGT = 377, + SLE = 378, + SGE = 379, + ULT = 380, + UGT = 381, + ULE = 382, + UGE = 383, + OEQ = 384, + ONE = 385, + OLT = 386, + OGT = 387, + OLE = 388, + OGE = 389, + ORD = 390, + UNO = 391, + UEQ = 392, + UNE = 393, + CAST = 394, + TRUNC = 395, + ZEXT = 396, + SEXT = 397, + FPTRUNC = 398, + FPEXT = 399, + FPTOUI = 400, + FPTOSI = 401, + UITOFP = 402, + SITOFP = 403, + PTRTOINT = 404, + INTTOPTR = 405, + BITCAST = 406 + }; +#endif +/* Tokens. */ +#define ESINT64VAL 258 +#define EUINT64VAL 259 +#define SINTVAL 260 +#define UINTVAL 261 +#define FPVAL 262 +#define VOID 263 +#define BOOL 264 +#define SBYTE 265 +#define UBYTE 266 +#define SHORT 267 +#define USHORT 268 +#define INT 269 +#define UINT 270 +#define LONG 271 +#define ULONG 272 +#define FLOAT 273 +#define DOUBLE 274 +#define TYPE 275 +#define LABEL 276 +#define VAR_ID 277 +#define LABELSTR 278 +#define STRINGCONSTANT 279 +#define IMPLEMENTATION 280 +#define ZEROINITIALIZER 281 +#define TRUETOK 282 +#define FALSETOK 283 +#define BEGINTOK 284 +#define ENDTOK 285 +#define DECLARE 286 +#define GLOBAL 287 +#define CONSTANT 288 +#define SECTION 289 +#define VOLATILE 290 +#define TO 291 +#define DOTDOTDOT 292 +#define NULL_TOK 293 +#define UNDEF 294 +#define CONST 295 +#define INTERNAL 296 +#define LINKONCE 297 +#define WEAK 298 +#define APPENDING 299 +#define DLLIMPORT 300 +#define DLLEXPORT 301 +#define EXTERN_WEAK 302 +#define OPAQUE 303 +#define NOT 304 +#define EXTERNAL 305 +#define TARGET 306 +#define TRIPLE 307 +#define ENDIAN 308 +#define POINTERSIZE 309 +#define LITTLE 310 +#define BIG 311 +#define ALIGN 312 +#define DEPLIBS 313 +#define CALL 314 +#define TAIL 315 +#define ASM_TOK 316 +#define MODULE 317 +#define SIDEEFFECT 318 +#define CC_TOK 319 +#define CCC_TOK 320 +#define CSRETCC_TOK 321 +#define FASTCC_TOK 322 +#define COLDCC_TOK 323 +#define X86_STDCALLCC_TOK 324 +#define X86_FASTCALLCC_TOK 325 +#define DATALAYOUT 326 +#define RET 327 +#define BR 328 +#define SWITCH 329 +#define INVOKE 330 +#define UNREACHABLE 331 +#define UNWIND 332 +#define EXCEPT 333 +#define ADD 334 +#define SUB 335 +#define MUL 336 +#define DIV 337 +#define UDIV 338 +#define SDIV 339 +#define FDIV 340 +#define REM 341 +#define UREM 342 +#define SREM 343 +#define FREM 344 +#define AND 345 +#define OR 346 +#define XOR 347 +#define SHL 348 +#define SHR 349 +#define ASHR 350 +#define LSHR 351 +#define SETLE 352 +#define SETGE 353 +#define SETLT 354 +#define SETGT 355 +#define SETEQ 356 +#define SETNE 357 +#define ICMP 358 +#define FCMP 359 +#define MALLOC 360 +#define ALLOCA 361 +#define FREE 362 +#define LOAD 363 +#define STORE 364 +#define GETELEMENTPTR 365 +#define PHI_TOK 366 +#define SELECT 367 +#define VAARG 368 +#define EXTRACTELEMENT 369 +#define INSERTELEMENT 370 +#define SHUFFLEVECTOR 371 +#define VAARG_old 372 +#define VANEXT_old 373 +#define EQ 374 +#define NE 375 +#define SLT 376 +#define SGT 377 +#define SLE 378 +#define SGE 379 +#define ULT 380 +#define UGT 381 +#define ULE 382 +#define UGE 383 +#define OEQ 384 +#define ONE 385 +#define OLT 386 +#define OGT 387 +#define OLE 388 +#define OGE 389 +#define ORD 390 +#define UNO 391 +#define UEQ 392 +#define UNE 393 +#define CAST 394 +#define TRUNC 395 +#define ZEXT 396 +#define SEXT 397 +#define FPTRUNC 398 +#define FPEXT 399 +#define FPTOUI 400 +#define FPTOSI 401 +#define UITOFP 402 +#define SITOFP 403 +#define PTRTOINT 404 +#define INTTOPTR 405 +#define BITCAST 406 + + + + +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE +#line 1680 "/home/duncan/LLVM/llvm.top/llvm/tools/llvm-upgrade/UpgradeParser.y" +{ llvm::Module *ModuleVal; llvm::Function *FunctionVal; std::pair *ArgVal; @@ -38,156 +387,14 @@ typedef union { llvm::ICmpInst::Predicate IPred; llvm::FCmpInst::Predicate FPred; llvm::Module::Endianness Endianness; -} YYSTYPE; -#define ESINT64VAL 257 -#define EUINT64VAL 258 -#define SINTVAL 259 -#define UINTVAL 260 -#define FPVAL 261 -#define VOID 262 -#define BOOL 263 -#define SBYTE 264 -#define UBYTE 265 -#define SHORT 266 -#define USHORT 267 -#define INT 268 -#define UINT 269 -#define LONG 270 -#define ULONG 271 -#define FLOAT 272 -#define DOUBLE 273 -#define TYPE 274 -#define LABEL 275 -#define VAR_ID 276 -#define LABELSTR 277 -#define STRINGCONSTANT 278 -#define IMPLEMENTATION 279 -#define ZEROINITIALIZER 280 -#define TRUETOK 281 -#define FALSETOK 282 -#define BEGINTOK 283 -#define ENDTOK 284 -#define DECLARE 285 -#define GLOBAL 286 -#define CONSTANT 287 -#define SECTION 288 -#define VOLATILE 289 -#define TO 290 -#define DOTDOTDOT 291 -#define NULL_TOK 292 -#define UNDEF 293 -#define CONST 294 -#define INTERNAL 295 -#define LINKONCE 296 -#define WEAK 297 -#define APPENDING 298 -#define DLLIMPORT 299 -#define DLLEXPORT 300 -#define EXTERN_WEAK 301 -#define OPAQUE 302 -#define NOT 303 -#define EXTERNAL 304 -#define TARGET 305 -#define TRIPLE 306 -#define ENDIAN 307 -#define POINTERSIZE 308 -#define LITTLE 309 -#define BIG 310 -#define ALIGN 311 -#define DEPLIBS 312 -#define CALL 313 -#define TAIL 314 -#define ASM_TOK 315 -#define MODULE 316 -#define SIDEEFFECT 317 -#define CC_TOK 318 -#define CCC_TOK 319 -#define CSRETCC_TOK 320 -#define FASTCC_TOK 321 -#define COLDCC_TOK 322 -#define X86_STDCALLCC_TOK 323 -#define X86_FASTCALLCC_TOK 324 -#define DATALAYOUT 325 -#define RET 326 -#define BR 327 -#define SWITCH 328 -#define INVOKE 329 -#define UNREACHABLE 330 -#define UNWIND 331 -#define EXCEPT 332 -#define ADD 333 -#define SUB 334 -#define MUL 335 -#define DIV 336 -#define UDIV 337 -#define SDIV 338 -#define FDIV 339 -#define REM 340 -#define UREM 341 -#define SREM 342 -#define FREM 343 -#define AND 344 -#define OR 345 -#define XOR 346 -#define SHL 347 -#define SHR 348 -#define ASHR 349 -#define LSHR 350 -#define SETLE 351 -#define SETGE 352 -#define SETLT 353 -#define SETGT 354 -#define SETEQ 355 -#define SETNE 356 -#define ICMP 357 -#define FCMP 358 -#define MALLOC 359 -#define ALLOCA 360 -#define FREE 361 -#define LOAD 362 -#define STORE 363 -#define GETELEMENTPTR 364 -#define PHI_TOK 365 -#define SELECT 366 -#define VAARG 367 -#define EXTRACTELEMENT 368 -#define INSERTELEMENT 369 -#define SHUFFLEVECTOR 370 -#define VAARG_old 371 -#define VANEXT_old 372 -#define EQ 373 -#define NE 374 -#define SLT 375 -#define SGT 376 -#define SLE 377 -#define SGE 378 -#define ULT 379 -#define UGT 380 -#define ULE 381 -#define UGE 382 -#define OEQ 383 -#define ONE 384 -#define OLT 385 -#define OGT 386 -#define OLE 387 -#define OGE 388 -#define ORD 389 -#define UNO 390 -#define UEQ 391 -#define UNE 392 -#define CAST 393 -#define TRUNC 394 -#define ZEXT 395 -#define SEXT 396 -#define FPTRUNC 397 -#define FPEXT 398 -#define FPTOUI 399 -#define FPTOSI 400 -#define UITOFP 401 -#define SITOFP 402 -#define PTRTOINT 403 -#define INTTOPTR 404 -#define BITCAST 405 - +} +/* Line 1489 of yacc.c. */ +#line 393 "UpgradeParser.tab.h" + YYSTYPE; +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 +#endif extern YYSTYPE Upgradelval; + diff --git a/tools/llvm-upgrade/UpgradeParser.y b/tools/llvm-upgrade/UpgradeParser.y index 211934f368a..b9a26cb9572 100644 --- a/tools/llvm-upgrade/UpgradeParser.y +++ b/tools/llvm-upgrade/UpgradeParser.y @@ -373,78 +373,6 @@ static Signedness getElementSign(const ConstInfo& CI, return result; } -/// This function determines if two function types differ only in their use of -/// the sret parameter attribute in the first argument. If they are identical -/// in all other respects, it returns true. Otherwise, it returns false. -static bool FuncTysDifferOnlyBySRet(const FunctionType *F1, - const FunctionType *F2) { - if (F1->getReturnType() != F2->getReturnType() || - F1->getNumParams() != F2->getNumParams()) - return false; - const ParamAttrsList *PAL1 = F1->getParamAttrs(); - const ParamAttrsList *PAL2 = F2->getParamAttrs(); - if (PAL1 && !PAL2 || PAL2 && !PAL1) - return false; - if (PAL1 && PAL2 && ((PAL1->size() != PAL2->size()) || - (PAL1->getParamAttrs(0) != PAL2->getParamAttrs(0)))) - return false; - unsigned SRetMask = ~unsigned(ParamAttr::StructRet); - for (unsigned i = 0; i < F1->getNumParams(); ++i) { - if (F1->getParamType(i) != F2->getParamType(i) || (PAL1 && PAL2 && - (unsigned(PAL1->getParamAttrs(i+1)) & SRetMask != - unsigned(PAL2->getParamAttrs(i+1)) & SRetMask))) - return false; - } - return true; -} - -/// This function determines if the type of V and Ty differ only by the SRet -/// parameter attribute. This is a more generalized case of -/// FuncTysDIfferOnlyBySRet since it doesn't require FunctionType arguments. -static bool TypesDifferOnlyBySRet(Value *V, const Type* Ty) { - if (V->getType() == Ty) - return true; - const PointerType *PF1 = dyn_cast(Ty); - const PointerType *PF2 = dyn_cast(V->getType()); - if (PF1 && PF2) { - const FunctionType* FT1 = dyn_cast(PF1->getElementType()); - const FunctionType* FT2 = dyn_cast(PF2->getElementType()); - if (FT1 && FT2) - return FuncTysDifferOnlyBySRet(FT1, FT2); - } - return false; -} - -// The upgrade of csretcc to sret param attribute may have caused a function -// to not be found because the param attribute changed the type of the called -// function. This helper function, used in getExistingValue, detects that -// situation and bitcasts the function to the correct type. -static Value* handleSRetFuncTypeMerge(Value *V, const Type* Ty) { - // Handle degenerate cases - if (!V) - return 0; - if (V->getType() == Ty) - return V; - - const PointerType *PF1 = dyn_cast(Ty); - const PointerType *PF2 = dyn_cast(V->getType()); - if (PF1 && PF2) { - const FunctionType *FT1 = dyn_cast(PF1->getElementType()); - const FunctionType *FT2 = dyn_cast(PF2->getElementType()); - if (FT1 && FT2 && FuncTysDifferOnlyBySRet(FT1, FT2)) { - const ParamAttrsList *PAL2 = FT2->getParamAttrs(); - if (PAL2 && PAL2->paramHasAttr(1, ParamAttr::StructRet)) - return V; - else if (Constant *C = dyn_cast(V)) - return ConstantExpr::getBitCast(C, PF1); - else - return new BitCastInst(V, PF1, "upgrd.cast", CurBB); - } - - } - return 0; -} - // getExistingValue - Look up the value specified by the provided type and // the provided ValID. If the value exists and has already been defined, return // it. Otherwise return null. @@ -491,8 +419,7 @@ static Value *getExistingValue(const Type *Ty, const ValID &D) { ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable(); V = SymTab.lookup(LookupName); if (V && V->getType() != Ty) - V = handleSRetFuncTypeMerge(V, Ty); - assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type"); + V = 0; } if (!V) { RenameMapType::const_iterator I = CurModule.RenameMap.find(Key); @@ -503,8 +430,7 @@ static Value *getExistingValue(const Type *Ty, const ValID &D) { LookupName = D.Name; V = CurModule.CurrentModule->getValueSymbolTable().lookup(LookupName); if (V && V->getType() != Ty) - V = handleSRetFuncTypeMerge(V, Ty); - assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type"); + V = 0; } if (!V) return 0; @@ -2139,7 +2065,7 @@ UpRTypes } const FunctionType *FTy = - FunctionType::get($1.PAT->get(), Params, isVarArg, PAL); + FunctionType::get($1.PAT->get(), Params, isVarArg); $$.PAT = new PATypeHolder( HandleUpRefs(FTy, $$.S) ); delete $1.PAT; // Delete the return type handle @@ -2925,19 +2851,7 @@ FunctionHeaderH if (isVarArg) ParamTyList.pop_back(); - // Convert the CSRet calling convention into the corresponding parameter - // attribute. - ParamAttrsList *PAL = 0; - if ($1 == OldCallingConv::CSRet) { - ParamAttrsVector Attrs; - ParamAttrsWithIndex PAWI; - PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg - Attrs.push_back(PAWI); - PAL = ParamAttrsList::get(Attrs); - } - - const FunctionType *FT = - FunctionType::get(RetTy, ParamTyList, isVarArg, PAL); + const FunctionType *FT = FunctionType::get(RetTy, ParamTyList, isVarArg); const PointerType *PFT = PointerType::get(FT); delete $2.PAT; @@ -3055,6 +2969,16 @@ FunctionHeaderH free($7); } + // Convert the CSRet calling convention into the corresponding parameter + // attribute. + if ($1 == OldCallingConv::CSRet) { + ParamAttrsVector Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg + Attrs.push_back(PAWI); + Fn->setParamAttrs(ParamAttrsList::get(Attrs)); + } + // Add all of the arguments we parsed to the function... if ($5) { // Is null if empty... if (isVarArg) { // Nuke the last entry @@ -3324,17 +3248,9 @@ BBTerminatorInst FTySign.add(I->S); } } - ParamAttrsList *PAL = 0; - if ($2 == OldCallingConv::CSRet) { - ParamAttrsVector Attrs; - ParamAttrsWithIndex PAWI; - PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg - Attrs.push_back(PAWI); - PAL = ParamAttrsList::get(Attrs); - } bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy; if (isVarArg) ParamTypes.pop_back(); - Ty = FunctionType::get($3.PAT->get(), ParamTypes, isVarArg, PAL); + Ty = FunctionType::get($3.PAT->get(), ParamTypes, isVarArg); PFTy = PointerType::get(Ty); $$.S.copy($3.S); } else { @@ -3376,6 +3292,13 @@ BBTerminatorInst $$.TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); } cast($$.TI)->setCallingConv(upgradeCallingConv($2)); + if ($2 == OldCallingConv::CSRet) { + ParamAttrsVector Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg + Attrs.push_back(PAWI); + cast($$.TI)->setParamAttrs(ParamAttrsList::get(Attrs)); + } delete $3.PAT; delete $6; lastCallingConv = OldCallingConv::C; @@ -3732,17 +3655,7 @@ InstVal if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy) error("Functions cannot return aggregate types"); - // Deal with CSRetCC - ParamAttrsList *PAL = 0; - if ($2 == OldCallingConv::CSRet) { - ParamAttrsVector Attrs; - ParamAttrsWithIndex PAWI; - PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg - Attrs.push_back(PAWI); - PAL = ParamAttrsList::get(Attrs); - } - - FTy = FunctionType::get(RetTy, ParamTypes, isVarArg, PAL); + FTy = FunctionType::get(RetTy, ParamTypes, isVarArg); PFTy = PointerType::get(FTy); $$.S.copy($3.S); } else { @@ -3794,8 +3707,17 @@ InstVal CallInst *CI = new CallInst(V, Args.begin(), Args.end()); CI->setTailCall($1); CI->setCallingConv(upgradeCallingConv($2)); + $$.I = CI; } + // Deal with CSRetCC + if ($2 == OldCallingConv::CSRet) { + ParamAttrsVector Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg + Attrs.push_back(PAWI); + cast($$.I)->setParamAttrs(ParamAttrsList::get(Attrs)); + } delete $3.PAT; delete $6; lastCallingConv = OldCallingConv::C; @@ -3874,17 +3796,11 @@ MemoryInst Value *StoreVal = $3.V; Value* tmpVal = getVal(PTy, $6); if (ElTy != $3.V->getType()) { - StoreVal = handleSRetFuncTypeMerge($3.V, ElTy); - if (!StoreVal) - error("Can't store '" + $3.V->getType()->getDescription() + - "' into space of type '" + ElTy->getDescription() + "'"); - else { - PTy = PointerType::get(StoreVal->getType()); - if (Constant *C = dyn_cast(tmpVal)) - tmpVal = ConstantExpr::getBitCast(C, PTy); - else - tmpVal = new BitCastInst(tmpVal, PTy, "upgrd.cast", CurBB); - } + PTy = PointerType::get(StoreVal->getType()); + if (Constant *C = dyn_cast(tmpVal)) + tmpVal = ConstantExpr::getBitCast(C, PTy); + else + tmpVal = new BitCastInst(tmpVal, PTy, "upgrd.cast", CurBB); } $$.I = new StoreInst(StoreVal, tmpVal, $1); $$.S.makeSignless(); diff --git a/tools/llvm-upgrade/UpgradeParser.y.cvs b/tools/llvm-upgrade/UpgradeParser.y.cvs index 211934f368a..b9a26cb9572 100644 --- a/tools/llvm-upgrade/UpgradeParser.y.cvs +++ b/tools/llvm-upgrade/UpgradeParser.y.cvs @@ -373,78 +373,6 @@ static Signedness getElementSign(const ConstInfo& CI, return result; } -/// This function determines if two function types differ only in their use of -/// the sret parameter attribute in the first argument. If they are identical -/// in all other respects, it returns true. Otherwise, it returns false. -static bool FuncTysDifferOnlyBySRet(const FunctionType *F1, - const FunctionType *F2) { - if (F1->getReturnType() != F2->getReturnType() || - F1->getNumParams() != F2->getNumParams()) - return false; - const ParamAttrsList *PAL1 = F1->getParamAttrs(); - const ParamAttrsList *PAL2 = F2->getParamAttrs(); - if (PAL1 && !PAL2 || PAL2 && !PAL1) - return false; - if (PAL1 && PAL2 && ((PAL1->size() != PAL2->size()) || - (PAL1->getParamAttrs(0) != PAL2->getParamAttrs(0)))) - return false; - unsigned SRetMask = ~unsigned(ParamAttr::StructRet); - for (unsigned i = 0; i < F1->getNumParams(); ++i) { - if (F1->getParamType(i) != F2->getParamType(i) || (PAL1 && PAL2 && - (unsigned(PAL1->getParamAttrs(i+1)) & SRetMask != - unsigned(PAL2->getParamAttrs(i+1)) & SRetMask))) - return false; - } - return true; -} - -/// This function determines if the type of V and Ty differ only by the SRet -/// parameter attribute. This is a more generalized case of -/// FuncTysDIfferOnlyBySRet since it doesn't require FunctionType arguments. -static bool TypesDifferOnlyBySRet(Value *V, const Type* Ty) { - if (V->getType() == Ty) - return true; - const PointerType *PF1 = dyn_cast(Ty); - const PointerType *PF2 = dyn_cast(V->getType()); - if (PF1 && PF2) { - const FunctionType* FT1 = dyn_cast(PF1->getElementType()); - const FunctionType* FT2 = dyn_cast(PF2->getElementType()); - if (FT1 && FT2) - return FuncTysDifferOnlyBySRet(FT1, FT2); - } - return false; -} - -// The upgrade of csretcc to sret param attribute may have caused a function -// to not be found because the param attribute changed the type of the called -// function. This helper function, used in getExistingValue, detects that -// situation and bitcasts the function to the correct type. -static Value* handleSRetFuncTypeMerge(Value *V, const Type* Ty) { - // Handle degenerate cases - if (!V) - return 0; - if (V->getType() == Ty) - return V; - - const PointerType *PF1 = dyn_cast(Ty); - const PointerType *PF2 = dyn_cast(V->getType()); - if (PF1 && PF2) { - const FunctionType *FT1 = dyn_cast(PF1->getElementType()); - const FunctionType *FT2 = dyn_cast(PF2->getElementType()); - if (FT1 && FT2 && FuncTysDifferOnlyBySRet(FT1, FT2)) { - const ParamAttrsList *PAL2 = FT2->getParamAttrs(); - if (PAL2 && PAL2->paramHasAttr(1, ParamAttr::StructRet)) - return V; - else if (Constant *C = dyn_cast(V)) - return ConstantExpr::getBitCast(C, PF1); - else - return new BitCastInst(V, PF1, "upgrd.cast", CurBB); - } - - } - return 0; -} - // getExistingValue - Look up the value specified by the provided type and // the provided ValID. If the value exists and has already been defined, return // it. Otherwise return null. @@ -491,8 +419,7 @@ static Value *getExistingValue(const Type *Ty, const ValID &D) { ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable(); V = SymTab.lookup(LookupName); if (V && V->getType() != Ty) - V = handleSRetFuncTypeMerge(V, Ty); - assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type"); + V = 0; } if (!V) { RenameMapType::const_iterator I = CurModule.RenameMap.find(Key); @@ -503,8 +430,7 @@ static Value *getExistingValue(const Type *Ty, const ValID &D) { LookupName = D.Name; V = CurModule.CurrentModule->getValueSymbolTable().lookup(LookupName); if (V && V->getType() != Ty) - V = handleSRetFuncTypeMerge(V, Ty); - assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type"); + V = 0; } if (!V) return 0; @@ -2139,7 +2065,7 @@ UpRTypes } const FunctionType *FTy = - FunctionType::get($1.PAT->get(), Params, isVarArg, PAL); + FunctionType::get($1.PAT->get(), Params, isVarArg); $$.PAT = new PATypeHolder( HandleUpRefs(FTy, $$.S) ); delete $1.PAT; // Delete the return type handle @@ -2925,19 +2851,7 @@ FunctionHeaderH if (isVarArg) ParamTyList.pop_back(); - // Convert the CSRet calling convention into the corresponding parameter - // attribute. - ParamAttrsList *PAL = 0; - if ($1 == OldCallingConv::CSRet) { - ParamAttrsVector Attrs; - ParamAttrsWithIndex PAWI; - PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg - Attrs.push_back(PAWI); - PAL = ParamAttrsList::get(Attrs); - } - - const FunctionType *FT = - FunctionType::get(RetTy, ParamTyList, isVarArg, PAL); + const FunctionType *FT = FunctionType::get(RetTy, ParamTyList, isVarArg); const PointerType *PFT = PointerType::get(FT); delete $2.PAT; @@ -3055,6 +2969,16 @@ FunctionHeaderH free($7); } + // Convert the CSRet calling convention into the corresponding parameter + // attribute. + if ($1 == OldCallingConv::CSRet) { + ParamAttrsVector Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg + Attrs.push_back(PAWI); + Fn->setParamAttrs(ParamAttrsList::get(Attrs)); + } + // Add all of the arguments we parsed to the function... if ($5) { // Is null if empty... if (isVarArg) { // Nuke the last entry @@ -3324,17 +3248,9 @@ BBTerminatorInst FTySign.add(I->S); } } - ParamAttrsList *PAL = 0; - if ($2 == OldCallingConv::CSRet) { - ParamAttrsVector Attrs; - ParamAttrsWithIndex PAWI; - PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg - Attrs.push_back(PAWI); - PAL = ParamAttrsList::get(Attrs); - } bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy; if (isVarArg) ParamTypes.pop_back(); - Ty = FunctionType::get($3.PAT->get(), ParamTypes, isVarArg, PAL); + Ty = FunctionType::get($3.PAT->get(), ParamTypes, isVarArg); PFTy = PointerType::get(Ty); $$.S.copy($3.S); } else { @@ -3376,6 +3292,13 @@ BBTerminatorInst $$.TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end()); } cast($$.TI)->setCallingConv(upgradeCallingConv($2)); + if ($2 == OldCallingConv::CSRet) { + ParamAttrsVector Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg + Attrs.push_back(PAWI); + cast($$.TI)->setParamAttrs(ParamAttrsList::get(Attrs)); + } delete $3.PAT; delete $6; lastCallingConv = OldCallingConv::C; @@ -3732,17 +3655,7 @@ InstVal if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy) error("Functions cannot return aggregate types"); - // Deal with CSRetCC - ParamAttrsList *PAL = 0; - if ($2 == OldCallingConv::CSRet) { - ParamAttrsVector Attrs; - ParamAttrsWithIndex PAWI; - PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg - Attrs.push_back(PAWI); - PAL = ParamAttrsList::get(Attrs); - } - - FTy = FunctionType::get(RetTy, ParamTypes, isVarArg, PAL); + FTy = FunctionType::get(RetTy, ParamTypes, isVarArg); PFTy = PointerType::get(FTy); $$.S.copy($3.S); } else { @@ -3794,8 +3707,17 @@ InstVal CallInst *CI = new CallInst(V, Args.begin(), Args.end()); CI->setTailCall($1); CI->setCallingConv(upgradeCallingConv($2)); + $$.I = CI; } + // Deal with CSRetCC + if ($2 == OldCallingConv::CSRet) { + ParamAttrsVector Attrs; + ParamAttrsWithIndex PAWI; + PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg + Attrs.push_back(PAWI); + cast($$.I)->setParamAttrs(ParamAttrsList::get(Attrs)); + } delete $3.PAT; delete $6; lastCallingConv = OldCallingConv::C; @@ -3874,17 +3796,11 @@ MemoryInst Value *StoreVal = $3.V; Value* tmpVal = getVal(PTy, $6); if (ElTy != $3.V->getType()) { - StoreVal = handleSRetFuncTypeMerge($3.V, ElTy); - if (!StoreVal) - error("Can't store '" + $3.V->getType()->getDescription() + - "' into space of type '" + ElTy->getDescription() + "'"); - else { - PTy = PointerType::get(StoreVal->getType()); - if (Constant *C = dyn_cast(tmpVal)) - tmpVal = ConstantExpr::getBitCast(C, PTy); - else - tmpVal = new BitCastInst(tmpVal, PTy, "upgrd.cast", CurBB); - } + PTy = PointerType::get(StoreVal->getType()); + if (Constant *C = dyn_cast(tmpVal)) + tmpVal = ConstantExpr::getBitCast(C, PTy); + else + tmpVal = new BitCastInst(tmpVal, PTy, "upgrd.cast", CurBB); } $$.I = new StoreInst(StoreVal, tmpVal, $1); $$.S.makeSignless(); diff --git a/tools/llvm2cpp/CppWriter.cpp b/tools/llvm2cpp/CppWriter.cpp index b7338cb409d..18bdc1b6668 100644 --- a/tools/llvm2cpp/CppWriter.cpp +++ b/tools/llvm2cpp/CppWriter.cpp @@ -114,6 +114,7 @@ public: private: void printLinkageType(GlobalValue::LinkageTypes LT); + void printVisibilityType(GlobalValue::VisibilityTypes VisTypes); void printCallingConv(unsigned cc); void printEscapedString(const std::string& str); void printCFP(const ConstantFP* CFP); @@ -124,6 +125,7 @@ private: std::string getCppName(const Value* val); inline void printCppName(const Value* val); + void printParamAttrs(const ParamAttrsList* PAL, const std::string &name); bool printTypeInternal(const Type* Ty); inline void printType(const Type* Ty); void printTypes(const Module* M); @@ -302,6 +304,22 @@ CppWriter::printLinkageType(GlobalValue::LinkageTypes LT) { } } +void +CppWriter::printVisibilityType(GlobalValue::VisibilityTypes VisType) { + switch (VisType) { + default: assert(0 && "Unknown GVar visibility"); + case GlobalValue::DefaultVisibility: + Out << "GlobalValue::DefaultVisibility"; + break; + case GlobalValue::HiddenVisibility: + Out << "GlobalValue::HiddenVisibility"; + break; + case GlobalValue::ProtectedVisibility: + Out << "GlobalValue::ProtectedVisibility"; + break; + } +} + // printEscapedString - Print each character of the specified string, escaping // it if it is not printable or if it is an escape char. void @@ -419,6 +437,42 @@ CppWriter::printCppName(const Value* val) { printEscapedString(getCppName(val)); } +void +CppWriter::printParamAttrs(const ParamAttrsList* PAL, const std::string &name) { + Out << "ParamAttrsList *" << name << "_PAL = 0;"; + nl(Out); + if (PAL) { + Out << '{'; in(); nl(Out); + Out << "ParamAttrsVector Attrs;"; nl(Out); + Out << "ParamAttrsWithIndex PAWI;"; nl(Out); + for (unsigned i = 0; i < PAL->size(); ++i) { + uint16_t index = PAL->getParamIndex(i); + uint16_t attrs = PAL->getParamAttrs(index); + Out << "PAWI.index = " << index << "; PAWI.attrs = 0 "; + if (attrs & ParamAttr::SExt) + Out << " | ParamAttr::SExt"; + if (attrs & ParamAttr::ZExt) + Out << " | ParamAttr::ZExt"; + if (attrs & ParamAttr::StructRet) + Out << " | ParamAttr::StructRet"; + if (attrs & ParamAttr::InReg) + Out << " | ParamAttr::InReg"; + if (attrs & ParamAttr::NoReturn) + Out << " | ParamAttr::NoReturn"; + if (attrs & ParamAttr::NoUnwind) + Out << " | ParamAttr::NoUnwind"; + Out << ";"; + nl(Out); + Out << "Attrs.push_back(PAWI);"; + nl(Out); + } + Out << name << "_PAL = ParamAttrsList::get(Attrs);"; + nl(Out); + out(); nl(Out); + Out << '}'; nl(Out); + } +} + bool CppWriter::printTypeInternal(const Type* Ty) { // We don't print definitions for primitive types @@ -471,41 +525,6 @@ CppWriter::printTypeInternal(const Type* Ty) { Out << ");"; nl(Out); } - const ParamAttrsList *PAL = FT->getParamAttrs(); - Out << "ParamAttrsList *" << typeName << "_PAL = 0;"; - nl(Out); - if (PAL) { - Out << '{'; in(); nl(Out); - Out << "ParamAttrsVector Attrs;"; nl(Out); - Out << "ParamAttrsWithIndex PAWI;"; nl(Out); - for (unsigned i = 0; i < PAL->size(); ++i) { - uint16_t index = PAL->getParamIndex(i); - uint16_t attrs = PAL->getParamAttrs(index); - Out << "PAWI.index = " << index << "; PAWI.attrs = 0 "; - if (attrs & ParamAttr::SExt) - Out << " | ParamAttr::SExt"; - if (attrs & ParamAttr::ZExt) - Out << " | ParamAttr::ZExt"; - if (attrs & ParamAttr::NoAlias) - Out << " | ParamAttr::NoAlias"; - if (attrs & ParamAttr::StructRet) - Out << " | ParamAttr::StructRet"; - if (attrs & ParamAttr::InReg) - Out << " | ParamAttr::InReg"; - if (attrs & ParamAttr::NoReturn) - Out << " | ParamAttr::NoReturn"; - if (attrs & ParamAttr::NoUnwind) - Out << " | ParamAttr::NoUnwind"; - Out << ";"; - nl(Out); - Out << "Attrs.push_back(PAWI);"; - nl(Out); - } - Out << typeName << "_PAL = ParamAttrsList::get(Attrs);"; - nl(Out); - out(); nl(Out); - Out << '}'; nl(Out); - } bool isForward = printTypeInternal(FT->getReturnType()); std::string retTypeName(getCppName(FT->getReturnType())); Out << "FunctionType* " << typeName << " = FunctionType::get("; @@ -514,8 +533,7 @@ CppWriter::printTypeInternal(const Type* Ty) { Out << "_fwd"; Out << ","; nl(Out) << "/*Params=*/" << typeName << "_args,"; - nl(Out) << "/*isVarArg=*/" << (FT->isVarArg() ? "true," : "false,") ; - nl(Out) << "/*ParamAttrs=*/" << typeName << "_PAL" << ");"; + nl(Out) << "/*isVarArg=*/" << (FT->isVarArg() ? "true" : "false") << ");"; out(); nl(Out); break; @@ -992,6 +1010,13 @@ void CppWriter::printVariableHead(const GlobalVariable *GV) { Out << "->setAlignment(" << utostr(GV->getAlignment()) << ");"; nl(Out); }; + if (GV->getVisibility() != GlobalValue::DefaultVisibility) { + printCppName(GV); + Out << "->setVisibility("; + printVisibilityType(GV->getVisibility()); + Out << ");"; + nl(Out); + } if (is_inline) { out(); Out << "}"; nl(Out); } @@ -1102,6 +1127,9 @@ CppWriter::printInstruction(const Instruction *I, const std::string& bbname) { nl(Out) << iName << "->setCallingConv("; printCallingConv(inv->getCallingConv()); Out << ");"; + printParamAttrs(inv->getParamAttrs(), iName); + Out << iName << "->setParamAttrs(" << iName << "_PAL);"; + nl(Out); break; } case Instruction::Unwind: { @@ -1362,6 +1390,9 @@ CppWriter::printInstruction(const Instruction *I, const std::string& bbname) { nl(Out) << iName << "->setTailCall(" << (call->isTailCall() ? "true":"false"); Out << ");"; + printParamAttrs(call->getParamAttrs(), iName); + Out << iName << "->setParamAttrs(" << iName << "_PAL);"; + nl(Out); break; } case Instruction::Select: { @@ -1533,10 +1564,21 @@ void CppWriter::printFunctionHead(const Function* F) { Out << "->setAlignment(" << F->getAlignment() << ");"; nl(Out); } + if (F->getVisibility() != GlobalValue::DefaultVisibility) { + printCppName(F); + Out << "->setVisibility("; + printVisibilityType(F->getVisibility()); + Out << ");"; + nl(Out); + } if (is_inline) { Out << "}"; nl(Out); } + printParamAttrs(F->getParamAttrs(), getCppName(F)); + printCppName(F); + Out << "->setParamAttrs(" << getCppName(F) << "_PAL);"; + nl(Out); } void CppWriter::printFunctionBody(const Function *F) { -- 2.34.1