Regenerate.

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

lib/AsmParser/Lexer.l.cvs

@@ -237,7 +237,6 @@ x86_stdcallcc   { return X86_STDCALLCC_TOK; }
 x86_fastcallcc  { return X86_FASTCALLCC_TOK; }
 
 void            { RET_TY(Type::VoidTy,  VOID);  }
-bool            { RET_TY(Type::Int1Ty,  BOOL);  }
 float           { RET_TY(Type::FloatTy, FLOAT); }
 double          { RET_TY(Type::DoubleTy,DOUBLE);}
 label           { RET_TY(Type::LabelTy, LABEL); }

lib/AsmParser/llvmAsmParser.h.cvs

@@ -1,9 +1,7 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made by GNU Bison 2.1.  */
 
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* Skeleton parser for Yacc-like parsing with Bison,
-
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-   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
@@ -20,18 +18,10 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
-/* As a special exception, you may create a larger work that contains
+/* As a special exception, when this file is copied by Bison into a
-   part or all of the Bison parser skeleton and distribute that work
+   Bison output file, you may use that output file without restriction.
-   under terms of your choice, so long as that work isn't itself a
+   This special exception was added by the Free Software Foundation
-   parser generator using the skeleton or a modified version thereof
+   in version 1.24 of Bison.  */
-   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
@@ -45,131 +35,130 @@
      UINTVAL = 261,
      FPVAL = 262,
      VOID = 263,
-     BOOL = 264,
+     INTTYPE = 264,
-     INTTYPE = 265,
+     FLOAT = 265,
-     FLOAT = 266,
+     DOUBLE = 266,
-     DOUBLE = 267,
+     LABEL = 267,
-     LABEL = 268,
+     TYPE = 268,
-     TYPE = 269,
+     VAR_ID = 269,
-     VAR_ID = 270,
+     LABELSTR = 270,
-     LABELSTR = 271,
+     STRINGCONSTANT = 271,
-     STRINGCONSTANT = 272,
+     IMPLEMENTATION = 272,
-     IMPLEMENTATION = 273,
+     ZEROINITIALIZER = 273,
-     ZEROINITIALIZER = 274,
+     TRUETOK = 274,
-     TRUETOK = 275,
+     FALSETOK = 275,
-     FALSETOK = 276,
+     BEGINTOK = 276,
-     BEGINTOK = 277,
+     ENDTOK = 277,
-     ENDTOK = 278,
+     DECLARE = 278,
-     DECLARE = 279,
+     DEFINE = 279,
-     DEFINE = 280,
+     GLOBAL = 280,
-     GLOBAL = 281,
+     CONSTANT = 281,
-     CONSTANT = 282,
+     SECTION = 282,
-     SECTION = 283,
+     VOLATILE = 283,
-     VOLATILE = 284,
+     TO = 284,
-     TO = 285,
+     DOTDOTDOT = 285,
-     DOTDOTDOT = 286,
+     NULL_TOK = 286,
-     NULL_TOK = 287,
+     UNDEF = 287,
-     UNDEF = 288,
+     INTERNAL = 288,
-     INTERNAL = 289,
+     LINKONCE = 289,
-     LINKONCE = 290,
+     WEAK = 290,
-     WEAK = 291,
+     APPENDING = 291,
-     APPENDING = 292,
+     DLLIMPORT = 292,
-     DLLIMPORT = 293,
+     DLLEXPORT = 293,
-     DLLEXPORT = 294,
+     EXTERN_WEAK = 294,
-     EXTERN_WEAK = 295,
+     OPAQUE = 295,
-     OPAQUE = 296,
+     EXTERNAL = 296,
-     EXTERNAL = 297,
+     TARGET = 297,
-     TARGET = 298,
+     TRIPLE = 298,
-     TRIPLE = 299,
+     ENDIAN = 299,
-     ENDIAN = 300,
+     POINTERSIZE = 300,
-     POINTERSIZE = 301,
+     LITTLE = 301,
-     LITTLE = 302,
+     BIG = 302,
-     BIG = 303,
+     ALIGN = 303,
-     ALIGN = 304,
+     DEPLIBS = 304,
-     DEPLIBS = 305,
+     CALL = 305,
-     CALL = 306,
+     TAIL = 306,
-     TAIL = 307,
+     ASM_TOK = 307,
-     ASM_TOK = 308,
+     MODULE = 308,
-     MODULE = 309,
+     SIDEEFFECT = 309,
-     SIDEEFFECT = 310,
+     CC_TOK = 310,
-     CC_TOK = 311,
+     CCC_TOK = 311,
-     CCC_TOK = 312,
+     CSRETCC_TOK = 312,
-     CSRETCC_TOK = 313,
+     FASTCC_TOK = 313,
-     FASTCC_TOK = 314,
+     COLDCC_TOK = 314,
-     COLDCC_TOK = 315,
+     X86_STDCALLCC_TOK = 315,
-     X86_STDCALLCC_TOK = 316,
+     X86_FASTCALLCC_TOK = 316,
-     X86_FASTCALLCC_TOK = 317,
+     DATALAYOUT = 317,
-     DATALAYOUT = 318,
+     RET = 318,
-     RET = 319,
+     BR = 319,
-     BR = 320,
+     SWITCH = 320,
-     SWITCH = 321,
+     INVOKE = 321,
-     INVOKE = 322,
+     UNWIND = 322,
-     UNWIND = 323,
+     UNREACHABLE = 323,
-     UNREACHABLE = 324,
+     ADD = 324,
-     ADD = 325,
+     SUB = 325,
-     SUB = 326,
+     MUL = 326,
-     MUL = 327,
+     UDIV = 327,
-     UDIV = 328,
+     SDIV = 328,
-     SDIV = 329,
+     FDIV = 329,
-     FDIV = 330,
+     UREM = 330,
-     UREM = 331,
+     SREM = 331,
-     SREM = 332,
+     FREM = 332,
-     FREM = 333,
+     AND = 333,
-     AND = 334,
+     OR = 334,
-     OR = 335,
+     XOR = 335,
-     XOR = 336,
+     ICMP = 336,
-     ICMP = 337,
+     FCMP = 337,
-     FCMP = 338,
+     EQ = 338,
-     EQ = 339,
+     NE = 339,
-     NE = 340,
+     SLT = 340,
-     SLT = 341,
+     SGT = 341,
-     SGT = 342,
+     SLE = 342,
-     SLE = 343,
+     SGE = 343,
-     SGE = 344,
+     ULT = 344,
-     ULT = 345,
+     UGT = 345,
-     UGT = 346,
+     ULE = 346,
-     ULE = 347,
+     UGE = 347,
-     UGE = 348,
+     OEQ = 348,
-     OEQ = 349,
+     ONE = 349,
-     ONE = 350,
+     OLT = 350,
-     OLT = 351,
+     OGT = 351,
-     OGT = 352,
+     OLE = 352,
-     OLE = 353,
+     OGE = 353,
-     OGE = 354,
+     ORD = 354,
-     ORD = 355,
+     UNO = 355,
-     UNO = 356,
+     UEQ = 356,
-     UEQ = 357,
+     UNE = 357,
-     UNE = 358,
+     MALLOC = 358,
-     MALLOC = 359,
+     ALLOCA = 359,
-     ALLOCA = 360,
+     FREE = 360,
-     FREE = 361,
+     LOAD = 361,
-     LOAD = 362,
+     STORE = 362,
-     STORE = 363,
+     GETELEMENTPTR = 363,
-     GETELEMENTPTR = 364,
+     TRUNC = 364,
-     TRUNC = 365,
+     ZEXT = 365,
-     ZEXT = 366,
+     SEXT = 366,
-     SEXT = 367,
+     FPTRUNC = 367,
-     FPTRUNC = 368,
+     FPEXT = 368,
-     FPEXT = 369,
+     BITCAST = 369,
-     BITCAST = 370,
+     UITOFP = 370,
-     UITOFP = 371,
+     SITOFP = 371,
-     SITOFP = 372,
+     FPTOUI = 372,
-     FPTOUI = 373,
+     FPTOSI = 373,
-     FPTOSI = 374,
+     INTTOPTR = 374,
-     INTTOPTR = 375,
+     PTRTOINT = 375,
-     PTRTOINT = 376,
+     PHI_TOK = 376,
-     PHI_TOK = 377,
+     SELECT = 377,
-     SELECT = 378,
+     SHL = 378,
-     SHL = 379,
+     LSHR = 379,
-     LSHR = 380,
+     ASHR = 380,
-     ASHR = 381,
+     VAARG = 381,
-     VAARG = 382,
+     EXTRACTELEMENT = 382,
-     EXTRACTELEMENT = 383,
+     INSERTELEMENT = 383,
-     INSERTELEMENT = 384,
+     SHUFFLEVECTOR = 384,
-     SHUFFLEVECTOR = 385,
+     NORETURN = 385,
-     NORETURN = 386,
+     DEFAULT = 386,
-     DEFAULT = 387,
+     HIDDEN = 387
-     HIDDEN = 388
    };
 #endif
 /* Tokens.  */
@@ -179,139 +168,137 @@
 #define UINTVAL 261
 #define FPVAL 262
 #define VOID 263
-#define BOOL 264
+#define INTTYPE 264
-#define INTTYPE 265
+#define FLOAT 265
-#define FLOAT 266
+#define DOUBLE 266
-#define DOUBLE 267
+#define LABEL 267
-#define LABEL 268
+#define TYPE 268
-#define TYPE 269
+#define VAR_ID 269
-#define VAR_ID 270
+#define LABELSTR 270
-#define LABELSTR 271
+#define STRINGCONSTANT 271
-#define STRINGCONSTANT 272
+#define IMPLEMENTATION 272
-#define IMPLEMENTATION 273
+#define ZEROINITIALIZER 273
-#define ZEROINITIALIZER 274
+#define TRUETOK 274
-#define TRUETOK 275
+#define FALSETOK 275
-#define FALSETOK 276
+#define BEGINTOK 276
-#define BEGINTOK 277
+#define ENDTOK 277
-#define ENDTOK 278
+#define DECLARE 278
-#define DECLARE 279
+#define DEFINE 279
-#define DEFINE 280
+#define GLOBAL 280
-#define GLOBAL 281
+#define CONSTANT 281
-#define CONSTANT 282
+#define SECTION 282
-#define SECTION 283
+#define VOLATILE 283
-#define VOLATILE 284
+#define TO 284
-#define TO 285
+#define DOTDOTDOT 285
-#define DOTDOTDOT 286
+#define NULL_TOK 286
-#define NULL_TOK 287
+#define UNDEF 287
-#define UNDEF 288
+#define INTERNAL 288
-#define INTERNAL 289
+#define LINKONCE 289
-#define LINKONCE 290
+#define WEAK 290
-#define WEAK 291
+#define APPENDING 291
-#define APPENDING 292
+#define DLLIMPORT 292
-#define DLLIMPORT 293
+#define DLLEXPORT 293
-#define DLLEXPORT 294
+#define EXTERN_WEAK 294
-#define EXTERN_WEAK 295
+#define OPAQUE 295
-#define OPAQUE 296
+#define EXTERNAL 296
-#define EXTERNAL 297
+#define TARGET 297
-#define TARGET 298
+#define TRIPLE 298
-#define TRIPLE 299
+#define ENDIAN 299
-#define ENDIAN 300
+#define POINTERSIZE 300
-#define POINTERSIZE 301
+#define LITTLE 301
-#define LITTLE 302
+#define BIG 302
-#define BIG 303
+#define ALIGN 303
-#define ALIGN 304
+#define DEPLIBS 304
-#define DEPLIBS 305
+#define CALL 305
-#define CALL 306
+#define TAIL 306
-#define TAIL 307
+#define ASM_TOK 307
-#define ASM_TOK 308
+#define MODULE 308
-#define MODULE 309
+#define SIDEEFFECT 309
-#define SIDEEFFECT 310
+#define CC_TOK 310
-#define CC_TOK 311
+#define CCC_TOK 311
-#define CCC_TOK 312
+#define CSRETCC_TOK 312
-#define CSRETCC_TOK 313
+#define FASTCC_TOK 313
-#define FASTCC_TOK 314
+#define COLDCC_TOK 314
-#define COLDCC_TOK 315
+#define X86_STDCALLCC_TOK 315
-#define X86_STDCALLCC_TOK 316
+#define X86_FASTCALLCC_TOK 316
-#define X86_FASTCALLCC_TOK 317
+#define DATALAYOUT 317
-#define DATALAYOUT 318
+#define RET 318
-#define RET 319
+#define BR 319
-#define BR 320
+#define SWITCH 320
-#define SWITCH 321
+#define INVOKE 321
-#define INVOKE 322
+#define UNWIND 322
-#define UNWIND 323
+#define UNREACHABLE 323
-#define UNREACHABLE 324
+#define ADD 324
-#define ADD 325
+#define SUB 325
-#define SUB 326
+#define MUL 326
-#define MUL 327
+#define UDIV 327
-#define UDIV 328
+#define SDIV 328
-#define SDIV 329
+#define FDIV 329
-#define FDIV 330
+#define UREM 330
-#define UREM 331
+#define SREM 331
-#define SREM 332
+#define FREM 332
-#define FREM 333
+#define AND 333
-#define AND 334
+#define OR 334
-#define OR 335
+#define XOR 335
-#define XOR 336
+#define ICMP 336
-#define ICMP 337
+#define FCMP 337
-#define FCMP 338
+#define EQ 338
-#define EQ 339
+#define NE 339
-#define NE 340
+#define SLT 340
-#define SLT 341
+#define SGT 341
-#define SGT 342
+#define SLE 342
-#define SLE 343
+#define SGE 343
-#define SGE 344
+#define ULT 344
-#define ULT 345
+#define UGT 345
-#define UGT 346
+#define ULE 346
-#define ULE 347
+#define UGE 347
-#define UGE 348
+#define OEQ 348
-#define OEQ 349
+#define ONE 349
-#define ONE 350
+#define OLT 350
-#define OLT 351
+#define OGT 351
-#define OGT 352
+#define OLE 352
-#define OLE 353
+#define OGE 353
-#define OGE 354
+#define ORD 354
-#define ORD 355
+#define UNO 355
-#define UNO 356
+#define UEQ 356
-#define UEQ 357
+#define UNE 357
-#define UNE 358
+#define MALLOC 358
-#define MALLOC 359
+#define ALLOCA 359
-#define ALLOCA 360
+#define FREE 360
-#define FREE 361
+#define LOAD 361
-#define LOAD 362
+#define STORE 362
-#define STORE 363
+#define GETELEMENTPTR 363
-#define GETELEMENTPTR 364
+#define TRUNC 364
-#define TRUNC 365
+#define ZEXT 365
-#define ZEXT 366
+#define SEXT 366
-#define SEXT 367
+#define FPTRUNC 367
-#define FPTRUNC 368
+#define FPEXT 368
-#define FPEXT 369
+#define BITCAST 369
-#define BITCAST 370
+#define UITOFP 370
-#define UITOFP 371
+#define SITOFP 371
-#define SITOFP 372
+#define FPTOUI 372
-#define FPTOUI 373
+#define FPTOSI 373
-#define FPTOSI 374
+#define INTTOPTR 374
-#define INTTOPTR 375
+#define PTRTOINT 375
-#define PTRTOINT 376
+#define PHI_TOK 376
-#define PHI_TOK 377
+#define SELECT 377
-#define SELECT 378
+#define SHL 378
-#define SHL 379
+#define LSHR 379
-#define LSHR 380
+#define ASHR 380
-#define ASHR 381
+#define VAARG 381
-#define VAARG 382
+#define EXTRACTELEMENT 382
-#define EXTRACTELEMENT 383
+#define INSERTELEMENT 383
-#define INSERTELEMENT 384
+#define SHUFFLEVECTOR 384
-#define SHUFFLEVECTOR 385
+#define NORETURN 385
-#define NORETURN 386
+#define DEFAULT 386
-#define DEFAULT 387
+#define HIDDEN 387
-#define HIDDEN 388
 
 
 
 
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-typedef union YYSTYPE
+#line 883 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-#line 883 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+typedef union YYSTYPE {
-{
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   llvm::BasicBlock                       *BasicBlockVal;
@@ -356,10 +343,9 @@ typedef union YYSTYPE
   llvm::Module::Endianness          Endianness;
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
-}
+} YYSTYPE;
-/* Line 1489 of yacc.c.  */
+/* Line 1447 of yacc.c.  */
-#line 362 "llvmAsmParser.tab.h"
+#line 349 "llvmAsmParser.tab.h"
-	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -367,3 +353,5 @@ typedef union YYSTYPE
 
 extern YYSTYPE llvmAsmlval;
 
+
+

lib/AsmParser/llvmAsmParser.y.cvs

@@ -970,7 +970,7 @@ Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) {
 // Built in types...
 %type  <TypeVal> Types ResultTypes
 %type  <PrimType> IntType FPType PrimType           // Classifications
-%token <PrimType> VOID BOOL INTTYPE 
+%token <PrimType> VOID INTTYPE 
 %token <PrimType> FLOAT DOUBLE LABEL
 %token TYPE
 
@@ -1198,7 +1198,7 @@ GlobalVarAttribute : SectionString {
 
 // Derived types are added later...
 //
-PrimType : BOOL | INTTYPE | FLOAT | DOUBLE | LABEL ;
+PrimType : INTTYPE | FLOAT | DOUBLE | LABEL ;
 
 Types 
   : OPAQUE {
@@ -1686,11 +1686,13 @@ ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr
     $$ = ConstantInt::get($1, $2);
     CHECK_FOR_ERROR
   }
-  | BOOL TRUETOK {                      // Boolean constants
+  | INTTYPE TRUETOK {                      // Boolean constants
+    assert(cast<IntegerType>($1)->getBitWidth() == 1 && "Not Bool?");
     $$ = ConstantInt::getTrue();
     CHECK_FOR_ERROR
   }
-  | BOOL FALSETOK {                     // Boolean constants
+  | INTTYPE FALSETOK {                     // Boolean constants
+    assert(cast<IntegerType>($1)->getBitWidth() == 1 && "Not Bool?");
     $$ = ConstantInt::getFalse();
     CHECK_FOR_ERROR
   }
@@ -2362,7 +2364,8 @@ BBTerminatorInst : RET ResolvedVal {              // Return with a result...
     CHECK_FOR_ERROR
     $$ = new BranchInst(tmpBB);
   }                                                  // Conditional Branch...
-  | BR BOOL ValueRef ',' LABEL ValueRef ',' LABEL ValueRef {  
+  | BR INTTYPE ValueRef ',' LABEL ValueRef ',' LABEL ValueRef {  
+    assert(cast<IntegerType>($2)->getBitWidth() == 1 && "Not Bool?");
     BasicBlock* tmpBBA = getBBVal($6);
     CHECK_FOR_ERROR
     BasicBlock* tmpBBB = getBBVal($9);