Regenerate.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33165 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 1102 insertions, 1068 deletions

diff --git a/tools/llvm-upgrade/UpgradeParser.cpp.cvs b/tools/llvm-upgrade/UpgradeParser.cpp.cvs
index da69f6f9bc..9859bd486c 100644
--- a/tools/llvm-upgrade/UpgradeParser.cpp.cvs
+++ b/tools/llvm-upgrade/UpgradeParser.cpp.cvs
@@ -110,108 +110,107 @@
      DLLEXPORT = 301,
      EXTERN_WEAK = 302,
      APPENDING = 303,
-     NOT = 304,
-     EXTERNAL = 305,
-     TARGET = 306,
-     TRIPLE = 307,
-     ENDIAN = 308,
-     POINTERSIZE = 309,
-     LITTLE = 310,
-     BIG = 311,
-     ALIGN = 312,
-     UNINITIALIZED = 313,
-     DEPLIBS = 314,
-     CALL = 315,
-     TAIL = 316,
-     ASM_TOK = 317,
-     MODULE = 318,
-     SIDEEFFECT = 319,
-     CC_TOK = 320,
-     CCC_TOK = 321,
-     CSRETCC_TOK = 322,
-     FASTCC_TOK = 323,
-     COLDCC_TOK = 324,
-     X86_STDCALLCC_TOK = 325,
-     X86_FASTCALLCC_TOK = 326,
-     DATALAYOUT = 327,
-     RET = 328,
-     BR = 329,
-     SWITCH = 330,
-     INVOKE = 331,
-     EXCEPT = 332,
-     UNWIND = 333,
-     UNREACHABLE = 334,
-     ADD = 335,
-     SUB = 336,
-     MUL = 337,
-     DIV = 338,
-     UDIV = 339,
-     SDIV = 340,
-     FDIV = 341,
-     REM = 342,
-     UREM = 343,
-     SREM = 344,
-     FREM = 345,
-     AND = 346,
-     OR = 347,
-     XOR = 348,
-     SETLE = 349,
-     SETGE = 350,
-     SETLT = 351,
-     SETGT = 352,
-     SETEQ = 353,
-     SETNE = 354,
-     ICMP = 355,
-     FCMP = 356,
-     EQ = 357,
-     NE = 358,
-     SLT = 359,
-     SGT = 360,
-     SLE = 361,
-     SGE = 362,
-     OEQ = 363,
-     ONE = 364,
-     OLT = 365,
-     OGT = 366,
-     OLE = 367,
-     OGE = 368,
-     ORD = 369,
-     UNO = 370,
-     UEQ = 371,
-     UNE = 372,
-     ULT = 373,
-     UGT = 374,
-     ULE = 375,
-     UGE = 376,
-     MALLOC = 377,
-     ALLOCA = 378,
-     FREE = 379,
-     LOAD = 380,
-     STORE = 381,
-     GETELEMENTPTR = 382,
-     PHI_TOK = 383,
-     SELECT = 384,
-     SHL = 385,
-     SHR = 386,
-     ASHR = 387,
-     LSHR = 388,
-     VAARG = 389,
-     EXTRACTELEMENT = 390,
-     INSERTELEMENT = 391,
-     SHUFFLEVECTOR = 392,
-     CAST = 393,
-     TRUNC = 394,
-     ZEXT = 395,
-     SEXT = 396,
-     FPTRUNC = 397,
-     FPEXT = 398,
-     FPTOUI = 399,
-     FPTOSI = 400,
-     UITOFP = 401,
-     SITOFP = 402,
-     PTRTOINT = 403,
-     INTTOPTR = 404,
-     BITCAST = 405
+     EXTERNAL = 304,
+     TARGET = 305,
+     TRIPLE = 306,
+     ENDIAN = 307,
+     POINTERSIZE = 308,
+     LITTLE = 309,
+     BIG = 310,
+     ALIGN = 311,
+     UNINITIALIZED = 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,
+     EXCEPT = 331,
+     UNWIND = 332,
+     UNREACHABLE = 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,
+     SETLE = 348,
+     SETGE = 349,
+     SETLT = 350,
+     SETGT = 351,
+     SETEQ = 352,
+     SETNE = 353,
+     ICMP = 354,
+     FCMP = 355,
+     EQ = 356,
+     NE = 357,
+     SLT = 358,
+     SGT = 359,
+     SLE = 360,
+     SGE = 361,
+     OEQ = 362,
+     ONE = 363,
+     OLT = 364,
+     OGT = 365,
+     OLE = 366,
+     OGE = 367,
+     ORD = 368,
+     UNO = 369,
+     UEQ = 370,
+     UNE = 371,
+     ULT = 372,
+     UGT = 373,
+     ULE = 374,
+     UGE = 375,
+     MALLOC = 376,
+     ALLOCA = 377,
+     FREE = 378,
+     LOAD = 379,
+     STORE = 380,
+     GETELEMENTPTR = 381,
+     PHI_TOK = 382,
+     SELECT = 383,
+     SHL = 384,
+     SHR = 385,
+     ASHR = 386,
+     LSHR = 387,
+     VAARG = 388,
+     EXTRACTELEMENT = 389,
+     INSERTELEMENT = 390,
+     SHUFFLEVECTOR = 391,
+     CAST = 392,
+     TRUNC = 393,
+     ZEXT = 394,
+     SEXT = 395,
+     FPTRUNC = 396,
+     FPEXT = 397,
+     FPTOUI = 398,
+     FPTOSI = 399,
+     UITOFP = 400,
+     SITOFP = 401,
+     PTRTOINT = 402,
+     INTTOPTR = 403,
+     BITCAST = 404
    };
 #endif
 /* Tokens.  */
@@ -261,108 +260,107 @@
 #define DLLEXPORT 301
 #define EXTERN_WEAK 302
 #define APPENDING 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 UNINITIALIZED 313
-#define DEPLIBS 314
-#define CALL 315
-#define TAIL 316
-#define ASM_TOK 317
-#define MODULE 318
-#define SIDEEFFECT 319
-#define CC_TOK 320
-#define CCC_TOK 321
-#define CSRETCC_TOK 322
-#define FASTCC_TOK 323
-#define COLDCC_TOK 324
-#define X86_STDCALLCC_TOK 325
-#define X86_FASTCALLCC_TOK 326
-#define DATALAYOUT 327
-#define RET 328
-#define BR 329
-#define SWITCH 330
-#define INVOKE 331
-#define EXCEPT 332
-#define UNWIND 333
-#define UNREACHABLE 334
-#define ADD 335
-#define SUB 336
-#define MUL 337
-#define DIV 338
-#define UDIV 339
-#define SDIV 340
-#define FDIV 341
-#define REM 342
-#define UREM 343
-#define SREM 344
-#define FREM 345
-#define AND 346
-#define OR 347
-#define XOR 348
-#define SETLE 349
-#define SETGE 350
-#define SETLT 351
-#define SETGT 352
-#define SETEQ 353
-#define SETNE 354
-#define ICMP 355
-#define FCMP 356
-#define EQ 357
-#define NE 358
-#define SLT 359
-#define SGT 360
-#define SLE 361
-#define SGE 362
-#define OEQ 363
-#define ONE 364
-#define OLT 365
-#define OGT 366
-#define OLE 367
-#define OGE 368
-#define ORD 369
-#define UNO 370
-#define UEQ 371
-#define UNE 372
-#define ULT 373
-#define UGT 374
-#define ULE 375
-#define UGE 376
-#define MALLOC 377
-#define ALLOCA 378
-#define FREE 379
-#define LOAD 380
-#define STORE 381
-#define GETELEMENTPTR 382
-#define PHI_TOK 383
-#define SELECT 384
-#define SHL 385
-#define SHR 386
-#define ASHR 387
-#define LSHR 388
-#define VAARG 389
-#define EXTRACTELEMENT 390
-#define INSERTELEMENT 391
-#define SHUFFLEVECTOR 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
+#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 UNINITIALIZED 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 EXCEPT 331
+#define UNWIND 332
+#define UNREACHABLE 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 SETLE 348
+#define SETGE 349
+#define SETLT 350
+#define SETGT 351
+#define SETEQ 352
+#define SETNE 353
+#define ICMP 354
+#define FCMP 355
+#define EQ 356
+#define NE 357
+#define SLT 358
+#define SGT 359
+#define SLE 360
+#define SGE 361
+#define OEQ 362
+#define ONE 363
+#define OLT 364
+#define OGT 365
+#define OLE 366
+#define OGE 367
+#define ORD 368
+#define UNO 369
+#define UEQ 370
+#define UNE 371
+#define ULT 372
+#define UGT 373
+#define ULE 374
+#define UGE 375
+#define MALLOC 376
+#define ALLOCA 377
+#define FREE 378
+#define LOAD 379
+#define STORE 380
+#define GETELEMENTPTR 381
+#define PHI_TOK 382
+#define SELECT 383
+#define SHL 384
+#define SHR 385
+#define ASHR 386
+#define LSHR 387
+#define VAARG 388
+#define EXTRACTELEMENT 389
+#define INSERTELEMENT 390
+#define SHUFFLEVECTOR 391
+#define CAST 392
+#define TRUNC 393
+#define ZEXT 394
+#define SEXT 395
+#define FPTRUNC 396
+#define FPEXT 397
+#define FPTOUI 398
+#define FPTOSI 399
+#define UITOFP 400
+#define SITOFP 401
+#define PTRTOINT 402
+#define INTTOPTR 403
+#define BITCAST 404
 
 
 
@@ -394,6 +392,10 @@ static uint64_t unique = 1;
 // definitions and calls.
 static bool AddAttributes = false;
 
+// This is set when a DECLARE keyword is recognized so that subsequent parsing
+// of a function prototype can know if its a declaration or definition.
+static bool isDeclare = false;
+
 // This bool is used to communicate between the InstVal and Inst rules about
 // whether or not a cast should be deleted. When the flag is set, InstVal has
 // determined that the cast is a candidate. However, it can only be deleted if
@@ -1174,7 +1176,7 @@ std::string getGlobalName(const std::string* Name, const std::string Linkage,
 #endif
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 802 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 806 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
 typedef union YYSTYPE {
   std::string*    String;
   const TypeInfo* Type;
@@ -1184,7 +1186,7 @@ typedef union YYSTYPE {
   TypeList*       TypeVec;
 } YYSTYPE;
 /* Line 196 of yacc.c.  */
-#line 1188 "UpgradeParser.tab.c"
+#line 1190 "UpgradeParser.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -1196,7 +1198,7 @@ typedef union YYSTYPE {
 
 
 /* Line 219 of yacc.c.  */
-#line 1200 "UpgradeParser.tab.c"
+#line 1202 "UpgradeParser.tab.c"
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
@@ -1347,20 +1349,20 @@ union yyalloc
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  4
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1463
+#define YYLAST   1473
 
 /* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  165
+#define YYNTOKENS  164
 /* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  75
+#define YYNNTS  76
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  300
+#define YYNRULES  301
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  584
+#define YYNSTATES  585
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   405
+#define YYMAXUTOK   404
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -1372,15 +1374,15 @@ static const unsigned char yytranslate[] =
        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,
-     154,   155,   163,     2,   152,     2,     2,     2,     2,     2,
+     153,   154,   162,     2,   151,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     159,   151,   160,     2,     2,     2,     2,     2,     2,     2,
+     158,   150,   159,     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,   156,   153,   158,     2,     2,     2,     2,     2,   164,
+       2,   155,   152,   157,     2,     2,     2,     2,     2,   163,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     157,     2,     2,   161,     2,   162,     2,     2,     2,     2,
+     156,     2,     2,   160,     2,   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,     2,     2,     2,     2,     2,     2,
@@ -1408,7 +1410,7 @@ static const unsigned char yytranslate[] =
      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
+     145,   146,   147,   148,   149
 };
 
 #if YYDEBUG
@@ -1438,150 +1440,150 @@ static const unsigned short int yyprhs[] =
      524,   531,   538,   542,   547,   548,   550,   552,   554,   558,
      562,   566,   570,   574,   578,   580,   581,   583,   585,   587,
      588,   591,   595,   597,   599,   603,   605,   606,   615,   617,
-     619,   623,   625,   627,   631,   632,   634,   636,   640,   641,
-     643,   645,   647,   649,   651,   653,   655,   657,   659,   663,
-     665,   671,   673,   675,   677,   679,   682,   685,   687,   690,
-     693,   694,   696,   698,   700,   703,   706,   710,   720,   730,
-     739,   754,   756,   758,   765,   771,   774,   781,   789,   791,
-     795,   797,   798,   801,   803,   809,   815,   821,   828,   835,
-     840,   845,   852,   857,   862,   869,   876,   879,   887,   889,
-     892,   893,   895,   896,   900,   907,   911,   918,   921,   926,
-     933
+     619,   623,   625,   627,   631,   632,   634,   636,   637,   642,
+     643,   645,   647,   649,   651,   653,   655,   657,   659,   661,
+     665,   667,   673,   675,   677,   679,   681,   684,   687,   689,
+     692,   695,   696,   698,   700,   702,   705,   708,   712,   722,
+     732,   741,   756,   758,   760,   767,   773,   776,   783,   791,
+     793,   797,   799,   800,   803,   805,   811,   817,   823,   830,
+     837,   842,   847,   854,   859,   864,   871,   878,   881,   889,
+     891,   894,   895,   897,   898,   902,   909,   913,   920,   923,
+     928,   935
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 static const short int yyrhs[] =
 {
-     199,     0,    -1,    19,    -1,    20,    -1,    17,    -1,    18,
-      -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,    93,    -1,    94,
-      -1,    95,    -1,    96,    -1,    97,    -1,    98,    -1,    99,
-      -1,   102,    -1,   103,    -1,   104,    -1,   105,    -1,   106,
-      -1,   107,    -1,   118,    -1,   119,    -1,   120,    -1,   121,
-      -1,   108,    -1,   109,    -1,   110,    -1,   111,    -1,   112,
-      -1,   113,    -1,   114,    -1,   115,    -1,   116,    -1,   117,
-      -1,   118,    -1,   119,    -1,   120,    -1,   121,    -1,    25,
-      -1,    26,    -1,   130,    -1,   131,    -1,   132,    -1,   133,
-      -1,   139,    -1,   140,    -1,   141,    -1,   142,    -1,   143,
-      -1,   144,    -1,   145,    -1,   146,    -1,   147,    -1,   148,
-      -1,   149,    -1,   150,    -1,   138,    -1,    11,    -1,     9,
+     198,     0,    -1,    19,    -1,    20,    -1,    17,    -1,    18,
+      -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,    93,
+      -1,    94,    -1,    95,    -1,    96,    -1,    97,    -1,    98,
+      -1,   101,    -1,   102,    -1,   103,    -1,   104,    -1,   105,
+      -1,   106,    -1,   117,    -1,   118,    -1,   119,    -1,   120,
+      -1,   107,    -1,   108,    -1,   109,    -1,   110,    -1,   111,
+      -1,   112,    -1,   113,    -1,   114,    -1,   115,    -1,   116,
+      -1,   117,    -1,   118,    -1,   119,    -1,   120,    -1,    25,
+      -1,    26,    -1,   129,    -1,   130,    -1,   131,    -1,   132,
+      -1,   138,    -1,   139,    -1,   140,    -1,   141,    -1,   142,
+      -1,   143,    -1,   144,    -1,   145,    -1,   146,    -1,   147,
+      -1,   148,    -1,   149,    -1,   137,    -1,    11,    -1,     9,
       -1,     7,    -1,     5,    -1,    12,    -1,    10,    -1,     8,
-      -1,     6,    -1,   175,    -1,   176,    -1,    13,    -1,    14,
-      -1,   208,   151,    -1,    -1,    42,    -1,    43,    -1,    44,
+      -1,     6,    -1,   174,    -1,   175,    -1,    13,    -1,    14,
+      -1,   207,   150,    -1,    -1,    42,    -1,    43,    -1,    44,
       -1,    48,    -1,    45,    -1,    46,    -1,    47,    -1,    -1,
-      66,    -1,    67,    -1,    68,    -1,    69,    -1,    70,    -1,
-      71,    -1,    65,    18,    -1,    -1,    -1,    57,    18,    -1,
-      -1,   152,    57,    18,    -1,    37,    30,    -1,    -1,   184,
-      -1,    -1,   152,   187,   186,    -1,   184,    -1,    57,    18,
-      -1,   190,    -1,     3,    -1,   192,    -1,     3,    -1,   192,
+      65,    -1,    66,    -1,    67,    -1,    68,    -1,    69,    -1,
+      70,    -1,    64,    18,    -1,    -1,    -1,    56,    18,    -1,
+      -1,   151,    56,    18,    -1,    37,    30,    -1,    -1,   183,
+      -1,    -1,   151,   186,   185,    -1,   183,    -1,    56,    18,
+      -1,   189,    -1,     3,    -1,   191,    -1,     3,    -1,   191,
       -1,     4,    -1,     5,    -1,     6,    -1,     7,    -1,     8,
       -1,     9,    -1,    10,    -1,    11,    -1,    12,    -1,    13,
-      -1,    14,    -1,    15,    -1,    16,    -1,   222,    -1,   191,
-      -1,   153,    18,    -1,   189,   154,   194,   155,    -1,   156,
-      18,   157,   192,   158,    -1,   159,    18,   157,   192,   160,
-      -1,   161,   193,   162,    -1,   161,   162,    -1,   159,   161,
-     193,   162,   160,    -1,   159,   161,   162,   160,    -1,   192,
-     163,    -1,   192,    -1,   193,   152,   192,    -1,   193,    -1,
-     193,   152,    40,    -1,    40,    -1,    -1,   190,   156,   197,
-     158,    -1,   190,   156,   158,    -1,   190,   164,    30,    -1,
-     190,   159,   197,   160,    -1,   190,   161,   197,   162,    -1,
-     190,   161,   162,    -1,   190,    22,    -1,   190,    23,    -1,
-     190,   222,    -1,   190,   196,    -1,   190,    24,    -1,   175,
-     167,    -1,   176,   167,    -1,     4,    25,    -1,     4,    26,
-      -1,   178,    21,    -1,   174,   154,   195,    39,   190,   155,
-      -1,   127,   154,   195,   237,   155,    -1,   129,   154,   195,
-     152,   195,   152,   195,   155,    -1,   168,   154,   195,   152,
-     195,   155,    -1,   169,   154,   195,   152,   195,   155,    -1,
-     170,   154,   195,   152,   195,   155,    -1,   100,   171,   154,
-     195,   152,   195,   155,    -1,   101,   172,   154,   195,   152,
-     195,   155,    -1,   173,   154,   195,   152,   195,   155,    -1,
-     135,   154,   195,   152,   195,   155,    -1,   136,   154,   195,
-     152,   195,   152,   195,   155,    -1,   137,   154,   195,   152,
-     195,   152,   195,   155,    -1,   197,   152,   195,    -1,   195,
-      -1,    35,    -1,    36,    -1,   200,    -1,   200,   217,    -1,
-     200,   219,    -1,   200,    63,    62,   203,    -1,   200,    31,
-      -1,   202,    -1,    50,    -1,    58,    -1,   202,   179,    27,
-     188,    -1,   202,   219,    -1,   202,    63,    62,   203,    -1,
-     202,   179,   180,   198,   195,   186,    -1,   202,   179,   201,
-     198,   190,   186,    -1,   202,   179,    45,   198,   190,   186,
-      -1,   202,   179,    47,   198,   190,   186,    -1,   202,    51,
-     205,    -1,   202,    59,   151,   206,    -1,    -1,    30,    -1,
-      56,    -1,    55,    -1,    53,   151,   204,    -1,    54,   151,
-      18,    -1,    52,   151,    30,    -1,    72,   151,    30,    -1,
-     156,   207,   158,    -1,   207,   152,    30,    -1,    30,    -1,
-      -1,    28,    -1,    30,    -1,   208,    -1,    -1,   190,   209,
-      -1,   211,   152,   210,    -1,   210,    -1,   211,    -1,   211,
-     152,    40,    -1,    40,    -1,    -1,   181,   188,   208,   154,
-     212,   155,   185,   182,    -1,    32,    -1,   161,    -1,   180,
-     213,   214,    -1,    33,    -1,   162,    -1,   215,   225,   216,
-      -1,    -1,    45,    -1,    47,    -1,    34,   218,   213,    -1,
-      -1,    64,    -1,    17,    -1,    18,    -1,    21,    -1,    25,
-      -1,    26,    -1,    22,    -1,    23,    -1,    24,    -1,   159,
-     197,   160,    -1,   196,    -1,    62,   220,    30,   152,    30,
-      -1,   166,    -1,   208,    -1,   222,    -1,   221,    -1,   190,
-     223,    -1,   225,   226,    -1,   226,    -1,   227,   229,    -1,
-     227,   231,    -1,    -1,    29,    -1,    78,    -1,    77,    -1,
-      73,   224,    -1,    73,     3,    -1,    74,    15,   223,    -1,
-      74,     4,   223,   152,    15,   223,   152,    15,   223,    -1,
-      75,   177,   223,   152,    15,   223,   156,   230,   158,    -1,
-      75,   177,   223,   152,    15,   223,   156,   158,    -1,   179,
-      76,   181,   188,   223,   154,   234,   155,    39,    15,   223,
-     228,    15,   223,    -1,   228,    -1,    79,    -1,   230,   177,
-     221,   152,    15,   223,    -1,   177,   221,   152,    15,   223,
-      -1,   179,   236,    -1,   190,   156,   223,   152,   223,   158,
-      -1,   232,   152,   156,   223,   152,   223,   158,    -1,   224,
-      -1,   233,   152,   224,    -1,   233,    -1,    -1,    61,    60,
-      -1,    60,    -1,   168,   190,   223,   152,   223,    -1,   169,
-     190,   223,   152,   223,    -1,   170,   190,   223,   152,   223,
-      -1,   100,   171,   190,   223,   152,   223,    -1,   101,   172,
-     190,   223,   152,   223,    -1,   173,   224,   152,   224,    -1,
-     174,   224,    39,   190,    -1,   129,   224,   152,   224,   152,
-     224,    -1,   134,   224,   152,   190,    -1,   135,   224,   152,
-     224,    -1,   136,   224,   152,   224,   152,   224,    -1,   137,
-     224,   152,   224,   152,   224,    -1,   128,   232,    -1,   235,
-     181,   188,   223,   154,   234,   155,    -1,   239,    -1,   152,
-     233,    -1,    -1,    38,    -1,    -1,   122,   190,   183,    -1,
-     122,   190,   152,    10,   223,   183,    -1,   123,   190,   183,
-      -1,   123,   190,   152,    10,   223,   183,    -1,   124,   224,
-      -1,   238,   125,   190,   223,    -1,   238,   126,   224,   152,
-     190,   223,    -1,   127,   190,   223,   237,    -1
+      -1,    14,    -1,    15,    -1,    16,    -1,   222,    -1,   190,
+      -1,   152,    18,    -1,   188,   153,   193,   154,    -1,   155,
+      18,   156,   191,   157,    -1,   158,    18,   156,   191,   159,
+      -1,   160,   192,   161,    -1,   160,   161,    -1,   158,   160,
+     192,   161,   159,    -1,   158,   160,   161,   159,    -1,   191,
+     162,    -1,   191,    -1,   192,   151,   191,    -1,   192,    -1,
+     192,   151,    40,    -1,    40,    -1,    -1,   189,   155,   196,
+     157,    -1,   189,   155,   157,    -1,   189,   163,    30,    -1,
+     189,   158,   196,   159,    -1,   189,   160,   196,   161,    -1,
+     189,   160,   161,    -1,   189,    22,    -1,   189,    23,    -1,
+     189,   222,    -1,   189,   195,    -1,   189,    24,    -1,   174,
+     166,    -1,   175,   166,    -1,     4,    25,    -1,     4,    26,
+      -1,   177,    21,    -1,   173,   153,   194,    39,   189,   154,
+      -1,   126,   153,   194,   237,   154,    -1,   128,   153,   194,
+     151,   194,   151,   194,   154,    -1,   167,   153,   194,   151,
+     194,   154,    -1,   168,   153,   194,   151,   194,   154,    -1,
+     169,   153,   194,   151,   194,   154,    -1,    99,   170,   153,
+     194,   151,   194,   154,    -1,   100,   171,   153,   194,   151,
+     194,   154,    -1,   172,   153,   194,   151,   194,   154,    -1,
+     134,   153,   194,   151,   194,   154,    -1,   135,   153,   194,
+     151,   194,   151,   194,   154,    -1,   136,   153,   194,   151,
+     194,   151,   194,   154,    -1,   196,   151,   194,    -1,   194,
+      -1,    35,    -1,    36,    -1,   199,    -1,   199,   216,    -1,
+     199,   218,    -1,   199,    62,    61,   202,    -1,   199,    31,
+      -1,   201,    -1,    49,    -1,    57,    -1,   201,   178,    27,
+     187,    -1,   201,   218,    -1,   201,    62,    61,   202,    -1,
+     201,   178,   179,   197,   194,   185,    -1,   201,   178,   200,
+     197,   189,   185,    -1,   201,   178,    45,   197,   189,   185,
+      -1,   201,   178,    47,   197,   189,   185,    -1,   201,    50,
+     204,    -1,   201,    58,   150,   205,    -1,    -1,    30,    -1,
+      55,    -1,    54,    -1,    52,   150,   203,    -1,    53,   150,
+      18,    -1,    51,   150,    30,    -1,    71,   150,    30,    -1,
+     155,   206,   157,    -1,   206,   151,    30,    -1,    30,    -1,
+      -1,    28,    -1,    30,    -1,   207,    -1,    -1,   189,   208,
+      -1,   210,   151,   209,    -1,   209,    -1,   210,    -1,   210,
+     151,    40,    -1,    40,    -1,    -1,   180,   187,   207,   153,
+     211,   154,   184,   181,    -1,    32,    -1,   160,    -1,   179,
+     212,   213,    -1,    33,    -1,   161,    -1,   214,   225,   215,
+      -1,    -1,    45,    -1,    47,    -1,    -1,    34,   219,   217,
+     212,    -1,    -1,    63,    -1,    17,    -1,    18,    -1,    21,
+      -1,    25,    -1,    26,    -1,    22,    -1,    23,    -1,    24,
+      -1,   158,   196,   159,    -1,   195,    -1,    61,   220,    30,
+     151,    30,    -1,   165,    -1,   207,    -1,   222,    -1,   221,
+      -1,   189,   223,    -1,   225,   226,    -1,   226,    -1,   227,
+     229,    -1,   227,   231,    -1,    -1,    29,    -1,    77,    -1,
+      76,    -1,    72,   224,    -1,    72,     3,    -1,    73,    15,
+     223,    -1,    73,     4,   223,   151,    15,   223,   151,    15,
+     223,    -1,    74,   176,   223,   151,    15,   223,   155,   230,
+     157,    -1,    74,   176,   223,   151,    15,   223,   155,   157,
+      -1,   178,    75,   180,   187,   223,   153,   234,   154,    39,
+      15,   223,   228,    15,   223,    -1,   228,    -1,    78,    -1,
+     230,   176,   221,   151,    15,   223,    -1,   176,   221,   151,
+      15,   223,    -1,   178,   236,    -1,   189,   155,   223,   151,
+     223,   157,    -1,   232,   151,   155,   223,   151,   223,   157,
+      -1,   224,    -1,   233,   151,   224,    -1,   233,    -1,    -1,
+      60,    59,    -1,    59,    -1,   167,   189,   223,   151,   223,
+      -1,   168,   189,   223,   151,   223,    -1,   169,   189,   223,
+     151,   223,    -1,    99,   170,   189,   223,   151,   223,    -1,
+     100,   171,   189,   223,   151,   223,    -1,   172,   224,   151,
+     224,    -1,   173,   224,    39,   189,    -1,   128,   224,   151,
+     224,   151,   224,    -1,   133,   224,   151,   189,    -1,   134,
+     224,   151,   224,    -1,   135,   224,   151,   224,   151,   224,
+      -1,   136,   224,   151,   224,   151,   224,    -1,   127,   232,
+      -1,   235,   180,   187,   223,   153,   234,   154,    -1,   239,
+      -1,   151,   233,    -1,    -1,    38,    -1,    -1,   121,   189,
+     182,    -1,   121,   189,   151,    10,   223,   182,    -1,   122,
+     189,   182,    -1,   122,   189,   151,    10,   223,   182,    -1,
+     123,   224,    -1,   238,   124,   189,   223,    -1,   238,   125,
+     224,   151,   189,   223,    -1,   126,   189,   223,   237,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,   867,   867,   867,   868,   868,   872,   872,   872,   872,
-     872,   872,   872,   873,   873,   873,   873,   874,   874,   874,
-     875,   875,   875,   875,   875,   875,   876,   876,   876,   876,
-     876,   876,   876,   876,   876,   876,   877,   877,   877,   877,
-     877,   877,   877,   877,   877,   877,   878,   878,   878,   878,
-     878,   878,   879,   879,   879,   879,   880,   880,   880,   880,
-     880,   880,   880,   881,   881,   881,   881,   881,   881,   886,
-     886,   886,   886,   887,   887,   887,   887,   888,   888,   889,
-     889,   892,   895,   900,   900,   900,   900,   900,   900,   901,
-     902,   905,   905,   905,   905,   905,   906,   907,   912,   917,
-     918,   921,   922,   930,   936,   937,   940,   941,   950,   951,
-     964,   964,   965,   965,   966,   970,   970,   970,   970,   970,
-     970,   970,   971,   971,   971,   971,   971,   973,   976,   979,
-     982,   986,   999,  1005,  1011,  1021,  1024,  1034,  1037,  1045,
-    1049,  1056,  1057,  1062,  1067,  1077,  1083,  1088,  1094,  1100,
-    1106,  1111,  1117,  1123,  1130,  1136,  1142,  1148,  1154,  1160,
-    1166,  1174,  1188,  1200,  1205,  1211,  1216,  1222,  1227,  1232,
-    1240,  1245,  1250,  1260,  1265,  1270,  1270,  1280,  1285,  1288,
-    1293,  1297,  1301,  1303,  1303,  1306,  1316,  1321,  1326,  1336,
-    1346,  1356,  1366,  1371,  1376,  1381,  1383,  1383,  1386,  1391,
-    1398,  1403,  1410,  1417,  1422,  1423,  1431,  1431,  1432,  1432,
-    1434,  1443,  1447,  1451,  1454,  1459,  1462,  1465,  1483,  1484,
-    1487,  1498,  1499,  1501,  1510,  1511,  1512,  1516,  1529,  1530,
-    1533,  1533,  1533,  1533,  1533,  1533,  1533,  1534,  1535,  1540,
-    1541,  1550,  1550,  1554,  1559,  1569,  1578,  1581,  1589,  1593,
-    1598,  1601,  1607,  1607,  1609,  1614,  1619,  1624,  1632,  1640,
-    1647,  1669,  1674,  1680,  1686,  1694,  1712,  1720,  1729,  1733,
-    1740,  1741,  1745,  1750,  1753,  1762,  1770,  1779,  1787,  1795,
-    1804,  1832,  1838,  1844,  1851,  1857,  1863,  1869,  1897,  1902,
-    1903,  1907,  1908,  1911,  1919,  1928,  1936,  1945,  1951,  1960,
-    1969
+       0,   871,   871,   871,   872,   872,   876,   876,   876,   876,
+     876,   876,   876,   877,   877,   877,   877,   878,   878,   878,
+     879,   879,   879,   879,   879,   879,   880,   880,   880,   880,
+     880,   880,   880,   880,   880,   880,   881,   881,   881,   881,
+     881,   881,   881,   881,   881,   881,   882,   882,   882,   882,
+     882,   882,   883,   883,   883,   883,   884,   884,   884,   884,
+     884,   884,   884,   885,   885,   885,   885,   885,   885,   890,
+     890,   890,   890,   891,   891,   891,   891,   892,   892,   893,
+     893,   896,   899,   904,   904,   904,   904,   904,   904,   905,
+     906,   909,   909,   909,   909,   909,   910,   911,   916,   921,
+     922,   925,   926,   934,   940,   941,   944,   945,   954,   955,
+     968,   968,   969,   969,   970,   974,   974,   974,   974,   974,
+     974,   974,   975,   975,   975,   975,   975,   977,   980,   983,
+     986,   990,  1003,  1009,  1015,  1025,  1028,  1038,  1041,  1049,
+    1053,  1060,  1061,  1066,  1071,  1081,  1087,  1092,  1098,  1104,
+    1110,  1115,  1121,  1127,  1134,  1140,  1146,  1152,  1158,  1164,
+    1170,  1178,  1192,  1204,  1209,  1215,  1220,  1226,  1231,  1236,
+    1244,  1249,  1254,  1264,  1269,  1274,  1274,  1284,  1289,  1292,
+    1297,  1301,  1305,  1307,  1307,  1310,  1320,  1325,  1330,  1340,
+    1350,  1360,  1370,  1375,  1380,  1385,  1387,  1387,  1390,  1395,
+    1402,  1407,  1414,  1421,  1426,  1427,  1435,  1435,  1436,  1436,
+    1438,  1447,  1451,  1455,  1458,  1463,  1466,  1469,  1492,  1493,
+    1496,  1507,  1508,  1510,  1519,  1520,  1521,  1525,  1525,  1539,
+    1540,  1543,  1543,  1543,  1543,  1543,  1543,  1543,  1544,  1545,
+    1550,  1551,  1560,  1560,  1564,  1569,  1579,  1588,  1591,  1599,
+    1603,  1608,  1611,  1617,  1617,  1619,  1624,  1629,  1634,  1642,
+    1650,  1657,  1679,  1684,  1690,  1696,  1704,  1722,  1730,  1739,
+    1743,  1750,  1751,  1755,  1760,  1763,  1772,  1780,  1789,  1797,
+    1805,  1814,  1842,  1848,  1854,  1861,  1867,  1873,  1879,  1926,
+    1931,  1932,  1936,  1937,  1940,  1948,  1957,  1965,  1974,  1980,
+    1989,  1998
 };
 #endif
 
@@ -1597,7 +1599,7 @@ static const char *const yytname[] =
   "TYPE", "VAR_ID", "LABELSTR", "STRINGCONSTANT", "IMPLEMENTATION",
   "BEGINTOK", "ENDTOK", "DECLARE", "GLOBAL", "CONSTANT", "SECTION",
   "VOLATILE", "TO", "DOTDOTDOT", "CONST", "INTERNAL", "LINKONCE", "WEAK",
-  "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "APPENDING", "NOT", "EXTERNAL",
+  "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "APPENDING", "EXTERNAL",
   "TARGET", "TRIPLE", "ENDIAN", "POINTERSIZE", "LITTLE", "BIG", "ALIGN",
   "UNINITIALIZED", "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE",
   "SIDEEFFECT", "CC_TOK", "CCC_TOK", "CSRETCC_TOK", "FASTCC_TOK",
@@ -1624,11 +1626,11 @@ static const char *const yytname[] =
   "BigOrLittle", "TargetDefinition", "LibrariesDefinition", "LibList",
   "Name", "OptName", "ArgVal", "ArgListH", "ArgList", "FunctionHeaderH",
   "BEGIN", "FunctionHeader", "END", "Function", "FnDeclareLinkage",
-  "FunctionProto", "OptSideEffect", "ConstValueRef", "SymbolicValueRef",
-  "ValueRef", "ResolvedVal", "BasicBlockList", "BasicBlock",
-  "InstructionList", "Unwind", "BBTerminatorInst", "JumpTable", "Inst",
-  "PHIList", "ValueRefList", "ValueRefListE", "OptTailCall", "InstVal",
-  "IndexList", "OptVolatile", "MemoryInst", 0
+  "FunctionProto", "@1", "OptSideEffect", "ConstValueRef",
+  "SymbolicValueRef", "ValueRef", "ResolvedVal", "BasicBlockList",
+  "BasicBlock", "InstructionList", "Unwind", "BBTerminatorInst",
+  "JumpTable", "Inst", "PHIList", "ValueRefList", "ValueRefListE",
+  "OptTailCall", "InstVal", "IndexList", "OptVolatile", "MemoryInst", 0
 };
 #endif
 
@@ -1652,45 +1654,45 @@ static const unsigned short int yytoknum[] =
      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,    61,    44,    92,    40,    41,    91,   120,    93,    60,
-      62,   123,   125,    42,    99
+      61,    44,    92,    40,    41,    91,   120,    93,    60,    62,
+     123,   125,    42,    99
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const unsigned char yyr1[] =
 {
-       0,   165,   166,   166,   167,   167,   168,   168,   168,   168,
-     168,   168,   168,   168,   168,   168,   168,   169,   169,   169,
+       0,   164,   165,   165,   166,   166,   167,   167,   167,   167,
+     167,   167,   167,   167,   167,   167,   167,   168,   168,   168,
+     169,   169,   169,   169,   169,   169,   170,   170,   170,   170,
      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,   196,   196,   196,   196,   196,   196,   196,   196,   196,
-     196,   196,   196,   197,   197,   198,   198,   199,   200,   200,
-     200,   200,   200,   201,   201,   202,   202,   202,   202,   202,
-     202,   202,   202,   202,   202,   203,   204,   204,   205,   205,
-     205,   205,   206,   207,   207,   207,   208,   208,   209,   209,
-     210,   211,   211,   212,   212,   212,   212,   213,   214,   214,
-     215,   216,   216,   217,   218,   218,   218,   219,   220,   220,
-     221,   221,   221,   221,   221,   221,   221,   221,   221,   221,
-     221,   222,   222,   223,   223,   224,   225,   225,   226,   227,
-     227,   227,   228,   228,   229,   229,   229,   229,   229,   229,
-     229,   229,   229,   230,   230,   231,   232,   232,   233,   233,
-     234,   234,   235,   235,   236,   236,   236,   236,   236,   236,
-     236,   236,   236,   236,   236,   236,   236,   236,   236,   237,
-     237,   238,   238,   239,   239,   239,   239,   239,   239,   239,
-     239
+     171,   171,   171,   171,   171,   171,   171,   171,   171,   171,
+     171,   171,   172,   172,   172,   172,   173,   173,   173,   173,
+     173,   173,   173,   173,   173,   173,   173,   173,   173,   174,
+     174,   174,   174,   175,   175,   175,   175,   176,   176,   177,
+     177,   178,   178,   179,   179,   179,   179,   179,   179,   179,