Forgot to revert r61031 when I reverted r61019, r61030, and r61040.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@61150 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2008-12-17 20:59:57 +00:00
parent a54d4b27b6
commit 29bc4f0dcc
3 changed files with 1367 additions and 1379 deletions

File diff suppressed because it is too large Load Diff

View File

@ -184,8 +184,8 @@
SRET = 400, SRET = 400,
NOUNWIND = 401, NOUNWIND = 401,
NOALIAS = 402, NOALIAS = 402,
NOCAPTURE = 403, BYVAL = 403,
BYVAL = 404, NEST = 404,
READNONE = 405, READNONE = 405,
READONLY = 406, READONLY = 406,
GC = 407, GC = 407,
@ -194,10 +194,9 @@
ALWAYSINLINE = 410, ALWAYSINLINE = 410,
SSP = 411, SSP = 411,
SSPREQ = 412, SSPREQ = 412,
NEST = 413, DEFAULT = 413,
DEFAULT = 414, HIDDEN = 414,
HIDDEN = 415, PROTECTED = 415
PROTECTED = 416
}; };
#endif #endif
/* Tokens. */ /* Tokens. */
@ -346,8 +345,8 @@
#define SRET 400 #define SRET 400
#define NOUNWIND 401 #define NOUNWIND 401
#define NOALIAS 402 #define NOALIAS 402
#define NOCAPTURE 403 #define BYVAL 403
#define BYVAL 404 #define NEST 404
#define READNONE 405 #define READNONE 405
#define READONLY 406 #define READONLY 406
#define GC 407 #define GC 407
@ -356,17 +355,16 @@
#define ALWAYSINLINE 410 #define ALWAYSINLINE 410
#define SSP 411 #define SSP 411
#define SSPREQ 412 #define SSPREQ 412
#define NEST 413 #define DEFAULT 413
#define DEFAULT 414 #define HIDDEN 414
#define HIDDEN 415 #define PROTECTED 415
#define PROTECTED 416
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE typedef union YYSTYPE
#line 986 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" #line 986 "/Volumes/Gir/devel/llvm/llvm.src/lib/AsmParser/llvmAsmParser.y"
{ {
llvm::Module *ModuleVal; llvm::Module *ModuleVal;
llvm::Function *FunctionVal; llvm::Function *FunctionVal;
@ -414,8 +412,8 @@ typedef union YYSTYPE
llvm::ICmpInst::Predicate IPredicate; llvm::ICmpInst::Predicate IPredicate;
llvm::FCmpInst::Predicate FPredicate; llvm::FCmpInst::Predicate FPredicate;
} }
/* Line 1489 of yacc.c. */ /* Line 1529 of yacc.c. */
#line 419 "llvmAsmParser.tab.h" #line 417 "llvmAsmParser.tab.h"
YYSTYPE; YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_DECLARED 1

View File

@ -1136,8 +1136,8 @@ Module *llvm::RunVMAsmParser(llvm::MemoryBuffer *MB) {
%token <OtherOpVal> EXTRACTVALUE INSERTVALUE %token <OtherOpVal> EXTRACTVALUE INSERTVALUE
// Function Attributes // Function Attributes
%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS NOCAPTURE BYVAL %token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS BYVAL NEST
%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ NEST %token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ
// Visibility Styles // Visibility Styles
%token DEFAULT HIDDEN PROTECTED %token DEFAULT HIDDEN PROTECTED
@ -1272,7 +1272,6 @@ Attribute : ZEROEXT { $$ = Attribute::ZExt; }
| INREG { $$ = Attribute::InReg; } | INREG { $$ = Attribute::InReg; }
| SRET { $$ = Attribute::StructRet; } | SRET { $$ = Attribute::StructRet; }
| NOALIAS { $$ = Attribute::NoAlias; } | NOALIAS { $$ = Attribute::NoAlias; }
| NOCAPTURE { $$ = Attribute::NoCapture; }
| BYVAL { $$ = Attribute::ByVal; } | BYVAL { $$ = Attribute::ByVal; }
| NEST { $$ = Attribute::Nest; } | NEST { $$ = Attribute::Nest; }
| ALIGN EUINT64VAL { $$ = | ALIGN EUINT64VAL { $$ =
@ -1288,7 +1287,6 @@ OptAttributes : /* empty */ { $$ = Attribute::None; }
RetAttr : INREG { $$ = Attribute::InReg; } RetAttr : INREG { $$ = Attribute::InReg; }
| ZEROEXT { $$ = Attribute::ZExt; } | ZEROEXT { $$ = Attribute::ZExt; }
| SIGNEXT { $$ = Attribute::SExt; } | SIGNEXT { $$ = Attribute::SExt; }
| NOALIAS { $$ = Attribute::NoAlias; }
; ;
OptRetAttrs : /* empty */ { $$ = Attribute::None; } OptRetAttrs : /* empty */ { $$ = Attribute::None; }
@ -1332,8 +1330,6 @@ OptAlign : /*empty*/ { $$ = 0; } |
$$ = $2; $$ = $2;
if ($$ != 0 && !isPowerOf2_32($$)) if ($$ != 0 && !isPowerOf2_32($$))
GEN_ERROR("Alignment must be a power of two"); GEN_ERROR("Alignment must be a power of two");
if ($$ > 0x40000000)
GEN_ERROR("Alignment too large");
CHECK_FOR_ERROR CHECK_FOR_ERROR
}; };
OptCAlign : /*empty*/ { $$ = 0; } | OptCAlign : /*empty*/ { $$ = 0; } |
@ -1341,8 +1337,6 @@ OptCAlign : /*empty*/ { $$ = 0; } |
$$ = $3; $$ = $3;
if ($$ != 0 && !isPowerOf2_32($$)) if ($$ != 0 && !isPowerOf2_32($$))
GEN_ERROR("Alignment must be a power of two"); GEN_ERROR("Alignment must be a power of two");
if ($$ > 0x40000000)
GEN_ERROR("Alignment too large");
CHECK_FOR_ERROR CHECK_FOR_ERROR
}; };
@ -1372,8 +1366,6 @@ GlobalVarAttribute : SectionString {
| ALIGN EUINT64VAL { | ALIGN EUINT64VAL {
if ($2 != 0 && !isPowerOf2_32($2)) if ($2 != 0 && !isPowerOf2_32($2))
GEN_ERROR("Alignment must be a power of two"); GEN_ERROR("Alignment must be a power of two");
if ($2 > 0x40000000)
GEN_ERROR("Alignment too large");
CurGV->setAlignment($2); CurGV->setAlignment($2);
CHECK_FOR_ERROR CHECK_FOR_ERROR
}; };