Update generated files.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@41706 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvm-upgrade/UpgradeParser.cpp.cvs b/tools/llvm-upgrade/UpgradeParser.cpp.cvs
index dda1bed..c8b747e 100644
--- a/tools/llvm-upgrade/UpgradeParser.cpp.cvs
+++ b/tools/llvm-upgrade/UpgradeParser.cpp.cvs
@@ -1,9 +1,7 @@
-/* A Bison parser, made by GNU Bison 2.3. */
+/* A Bison parser, made by GNU Bison 1.875c. */
-/* Skeleton implementation for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
+/* Skeleton parser for Yacc-like parsing with Bison,
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 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
@@ -17,24 +15,16 @@
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. */
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, 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.
+/* 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 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. */
+/* 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
@@ -46,9 +36,6 @@
/* Identify Bison output. */
#define YYBISON 1
-/* Bison version. */
-#define YYBISON_VERSION "2.3"
-
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -58,7 +45,8 @@
/* Using locations. */
#define YYLSP_NEEDED 0
-/* Substitute the variable and function names. */
+/* If NAME_PREFIX is specified substitute the variables and functions
+ names. */
#define yyparse Upgradeparse
#define yylex Upgradelex
#define yyerror Upgradeerror
@@ -225,7 +213,6 @@
BITCAST = 406
};
#endif
-/* Tokens. */
#define ESINT64VAL 258
#define EUINT64VAL 259
#define SINTVAL 260
@@ -380,7 +367,7 @@
/* Copy the first part of user declarations. */
-#line 14 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 14 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
#include "UpgradeInternals.h"
#include "llvm/CallingConv.h"
@@ -1903,8 +1890,8 @@
}
}
Result.push_back(Index);
- Ty = GetElementPtrInst::getIndexedType(PTy, (Value**)&Result[0],
- Result.size(),true);
+ Ty = GetElementPtrInst::getIndexedType(PTy, Result.begin(),
+ Result.end(),true);
if (!Ty)
error("Index list invalid for constant getelementptr");
}
@@ -1949,7 +1936,8 @@
}
}
Result.push_back(Index);
- Ty = GetElementPtrInst::getIndexedType(PTy, &Result[0], Result.size(),true);
+ Ty = GetElementPtrInst::getIndexedType(PTy, Result.begin(),
+ Result.end(),true);
if (!Ty)
error("Index list invalid for constant getelementptr");
}
@@ -2093,11 +2081,12 @@
while (!F->use_empty()) {
CallInst* CI = cast<CallInst>(F->use_back());
- SmallVector<Value *, 2> Args;
- Args.push_back(new AllocaInst(ArgTy, 0, "vacopy.fix.1", CI));
- Args.push_back(new AllocaInst(ArgTy, 0, "vacopy.fix.2", CI));
+ Value *Args[2] = {
+ new AllocaInst(ArgTy, 0, "vacopy.fix.1", CI),
+ new AllocaInst(ArgTy, 0, "vacopy.fix.2", CI)
+ };
new StoreInst(CI->getOperand(1), Args[1], CI);
- new CallInst(NF, Args.begin(), Args.end(), "", CI);
+ new CallInst(NF, Args, Args + 2, "", CI);
Value* foo = new LoadInst(Args[0], "vacopy.fix.3", CI);
CI->replaceAllUsesWith(foo);
CI->getParent()->getInstList().erase(CI);
@@ -2128,15 +2117,9 @@
# 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 1748 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#line 1750 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+typedef union YYSTYPE {
llvm::Module *ModuleVal;
llvm::Function *FunctionVal;
std::pair<llvm::PATypeInfo, char*> *ArgVal;
@@ -2176,10 +2159,9 @@
llvm::ICmpInst::Predicate IPred;
llvm::FCmpInst::Predicate FPred;
llvm::Module::Endianness Endianness;
-}
-/* Line 187 of yacc.c. */
-#line 2182 "UpgradeParser.tab.c"
- YYSTYPE;
+} YYSTYPE;
+/* Line 191 of yacc.c. */
+#line 2165 "UpgradeParser.tab.c"
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
@@ -2190,171 +2172,49 @@
/* Copy the second part of user declarations. */
-/* Line 216 of yacc.c. */
-#line 2195 "UpgradeParser.tab.c"
+/* Line 214 of yacc.c. */
+#line 2177 "UpgradeParser.tab.c"
-#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
-
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
-#else
-typedef short int yytype_int16;
-#endif
-
-#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 <stddef.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
-# else
-# define YYSIZE_T unsigned int
-# endif
-#endif
-
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
-
-#ifndef YY_
-# if YYENABLE_NLS
-# if ENABLE_NLS
-# include <libintl.h> /* 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
-
-/* 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
+#if ! defined (yyoverflow) || YYERROR_VERBOSE
/* The parser invokes alloca or malloc; define the necessary symbols. */
# ifdef YYSTACK_USE_ALLOCA
# if YYSTACK_USE_ALLOCA
+# define YYSTACK_ALLOC alloca
+# endif
+# else
+# if defined (alloca) || defined (_ALLOCA_H)
+# define YYSTACK_ALLOC alloca
+# else
# ifdef __GNUC__
# define YYSTACK_ALLOC __builtin_alloca
-# elif defined __BUILTIN_VA_ARG_INCR
-# include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-# elif defined _AIX
-# define YYSTACK_ALLOC __alloca
-# elif defined _MSC_VER
-# include <malloc.h> /* 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 <stdlib.h> /* 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
+ /* Pacify GCC's `empty if-body' warning. */
+# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
# 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)))
+# if defined (__STDC__) || defined (__cplusplus)
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
-# endif
+# define YYSIZE_T size_t
# 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
+# define YYSTACK_ALLOC malloc
+# define YYSTACK_FREE free
# endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
-#if (! defined yyoverflow \
- && (! defined __cplusplus \
- || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+#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;
+ short yyss;
YYSTYPE yyvs;
};
@@ -2364,24 +2224,24 @@
/* 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)) \
+ ((N) * (sizeof (short) + 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__
+# 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; \
+ register YYSIZE_T yyi; \
for (yyi = 0; yyi < (Count); yyi++) \
(To)[yyi] = (From)[yyi]; \
} \
- while (YYID (0))
+ while (0)
# endif
# endif
@@ -2399,33 +2259,39 @@
yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
yyptr += yynewbytes / sizeof (*yyptr); \
} \
- while (YYID (0))
+ while (0)
#endif
-/* YYFINAL -- State number of the termination state. */
+#if defined (__STDC__) || defined (__cplusplus)
+ typedef signed char yysigned_char;
+#else
+ typedef short yysigned_char;
+#endif
+
+/* YYFINAL -- State number of the termination state. */
#define YYFINAL 4
/* YYLAST -- Last index in YYTABLE. */
#define YYLAST 1630
-/* YYNTOKENS -- Number of terminals. */
+/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 166
-/* YYNNTS -- Number of nonterminals. */
+/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 81
-/* YYNRULES -- Number of rules. */
+/* YYNRULES -- Number of rules. */
#define YYNRULES 310
-/* YYNRULES -- Number of states. */
+/* YYNRULES -- Number of states. */
#define YYNSTATES 606
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
#define YYMAXUTOK 406
-#define YYTRANSLATE(YYX) \
+#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
-static const yytype_uint8 yytranslate[] =
+static const unsigned char yytranslate[] =
{
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -2473,7 +2339,7 @@
#if YYDEBUG
/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
YYRHS. */
-static const yytype_uint16 yyprhs[] =
+static const unsigned short yyprhs[] =
{
0, 0, 3, 5, 7, 9, 11, 13, 15, 17,
19, 21, 23, 25, 27, 29, 31, 33, 35, 37,
@@ -2509,8 +2375,8 @@
969
};
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yytype_int16 yyrhs[] =
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+static const short yyrhs[] =
{
200, 0, -1, 5, -1, 6, -1, 3, -1, 4,
-1, 79, -1, 80, -1, 81, -1, 82, -1, 83,
@@ -2613,46 +2479,46 @@
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
-static const yytype_uint16 yyrline[] =
+static const unsigned short yyrline[] =
{
- 0, 1888, 1888, 1889, 1897, 1898, 1908, 1908, 1908, 1908,
- 1908, 1908, 1908, 1908, 1908, 1908, 1908, 1912, 1912, 1912,
- 1916, 1916, 1916, 1916, 1916, 1916, 1920, 1920, 1921, 1921,
- 1922, 1922, 1923, 1923, 1924, 1924, 1928, 1928, 1929, 1929,
- 1930, 1930, 1931, 1931, 1932, 1932, 1933, 1933, 1934, 1934,
- 1935, 1936, 1939, 1939, 1939, 1939, 1943, 1943, 1943, 1943,
- 1943, 1943, 1943, 1944, 1944, 1944, 1944, 1944, 1944, 1950,
- 1950, 1950, 1950, 1954, 1954, 1954, 1954, 1958, 1958, 1962,
- 1962, 1967, 1970, 1975, 1976, 1977, 1978, 1979, 1980, 1981,
- 1982, 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 2003,
- 2004, 2012, 2013, 2021, 2030, 2031, 2038, 2039, 2043, 2047,
- 2063, 2064, 2071, 2072, 2079, 2087, 2087, 2087, 2087, 2087,
- 2087, 2087, 2088, 2088, 2088, 2088, 2088, 2093, 2097, 2101,
- 2106, 2115, 2142, 2148, 2161, 2172, 2176, 2189, 2193, 2207,
- 2211, 2218, 2219, 2225, 2232, 2244, 2274, 2287, 2310, 2338,
- 2360, 2371, 2393, 2404, 2413, 2418, 2477, 2484, 2492, 2499,
- 2506, 2510, 2514, 2523, 2538, 2550, 2559, 2587, 2600, 2609,
- 2615, 2621, 2632, 2638, 2644, 2655, 2656, 2665, 2666, 2678,
- 2687, 2688, 2689, 2690, 2691, 2707, 2727, 2729, 2731, 2731,
- 2738, 2738, 2746, 2746, 2754, 2754, 2763, 2765, 2767, 2772,
- 2786, 2787, 2791, 2794, 2802, 2806, 2813, 2817, 2821, 2825,
- 2833, 2833, 2837, 2838, 2842, 2850, 2855, 2863, 2864, 2871,
- 2878, 2882, 3072, 3072, 3076, 3076, 3086, 3086, 3090, 3095,
- 3096, 3097, 3101, 3102, 3101, 3114, 3115, 3120, 3121, 3122,
- 3123, 3127, 3131, 3132, 3133, 3134, 3155, 3159, 3173, 3174,
- 3179, 3179, 3187, 3197, 3200, 3209, 3220, 3225, 3234, 3245,
- 3245, 3248, 3252, 3256, 3261, 3271, 3289, 3298, 3371, 3375,
- 3382, 3394, 3409, 3439, 3449, 3459, 3463, 3470, 3471, 3475,
- 3478, 3484, 3503, 3521, 3537, 3551, 3565, 3576, 3594, 3603,
- 3612, 3619, 3640, 3664, 3670, 3676, 3682, 3698, 3791, 3799,
- 3800, 3804, 3805, 3809, 3815, 3822, 3828, 3835, 3842, 3855,
- 3881
+ 0, 1890, 1890, 1891, 1899, 1900, 1910, 1910, 1910, 1910,
+ 1910, 1910, 1910, 1910, 1910, 1910, 1910, 1914, 1914, 1914,
+ 1918, 1918, 1918, 1918, 1918, 1918, 1922, 1922, 1923, 1923,
+ 1924, 1924, 1925, 1925, 1926, 1926, 1930, 1930, 1931, 1931,
+ 1932, 1932, 1933, 1933, 1934, 1934, 1935, 1935, 1936, 1936,
+ 1937, 1938, 1941, 1941, 1941, 1941, 1945, 1945, 1945, 1945,
+ 1945, 1945, 1945, 1946, 1946, 1946, 1946, 1946, 1946, 1952,
+ 1952, 1952, 1952, 1956, 1956, 1956, 1956, 1960, 1960, 1964,
+ 1964, 1969, 1972, 1977, 1978, 1979, 1980, 1981, 1982, 1983,
+ 1984, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 2005,
+ 2006, 2014, 2015, 2023, 2032, 2033, 2040, 2041, 2045, 2049,
+ 2065, 2066, 2073, 2074, 2081, 2089, 2089, 2089, 2089, 2089,
+ 2089, 2089, 2090, 2090, 2090, 2090, 2090, 2095, 2099, 2103,
+ 2108, 2117, 2144, 2150, 2163, 2174, 2178, 2191, 2195, 2209,
+ 2213, 2220, 2221, 2227, 2234, 2246, 2276, 2289, 2312, 2340,
+ 2362, 2373, 2395, 2406, 2415, 2420, 2479, 2486, 2494, 2501,
+ 2508, 2512, 2516, 2525, 2540, 2552, 2561, 2589, 2602, 2611,
+ 2617, 2623, 2634, 2640, 2646, 2657, 2658, 2667, 2668, 2680,
+ 2689, 2690, 2691, 2692, 2693, 2709, 2729, 2731, 2733, 2733,
+ 2740, 2740, 2748, 2748, 2756, 2756, 2765, 2767, 2769, 2774,
+ 2788, 2789, 2793, 2796, 2804, 2808, 2815, 2819, 2823, 2827,
+ 2835, 2835, 2839, 2840, 2844, 2852, 2857, 2865, 2866, 2873,
+ 2880, 2884, 3074, 3074, 3078, 3078, 3088, 3088, 3092, 3097,
+ 3098, 3099, 3103, 3104, 3103, 3116, 3117, 3122, 3123, 3124,
+ 3125, 3129, 3133, 3134, 3135, 3136, 3157, 3161, 3175, 3176,
+ 3181, 3181, 3189, 3199, 3202, 3211, 3222, 3227, 3236, 3247,
+ 3247, 3250, 3254, 3258, 3263, 3273, 3291, 3300, 3374, 3378,
+ 3385, 3397, 3412, 3442, 3452, 3462, 3466, 3473, 3474, 3478,
+ 3481, 3487, 3506, 3524, 3540, 3554, 3568, 3579, 3597, 3606,
+ 3615, 3622, 3643, 3667, 3673, 3679, 3685, 3701, 3794, 3802,
+ 3803, 3807, 3808, 3812, 3818, 3825, 3831, 3838, 3845, 3858,
+ 3884
};
#endif
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
- First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+#if YYDEBUG || YYERROR_VERBOSE
+/* YYTNME[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",
@@ -2701,7 +2567,7 @@
# ifdef YYPRINT
/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
token YYLEX-NUM. */
-static const yytype_uint16 yytoknum[] =
+static const unsigned short yytoknum[] =
{
0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
@@ -2724,7 +2590,7 @@
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const yytype_uint8 yyr1[] =
+static const unsigned char yyr1[] =
{
0, 166, 167, 167, 168, 168, 169, 169, 169, 169,
169, 169, 169, 169, 169, 169, 169, 170, 170, 170,
@@ -2761,7 +2627,7 @@
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const yytype_uint8 yyr2[] =
+static const unsigned char yyr2[] =
{
0, 2, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -2800,7 +2666,7 @@
/* 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[] =
+static const unsigned short yydefact[] =
{
198, 0, 90, 184, 1, 183, 232, 83, 84, 85,
86, 87, 88, 89, 0, 224, 257, 180, 181, 257,
@@ -2865,8 +2731,8 @@
0, 271, 0, 0, 270, 267
};
-/* YYDEFGOTO[NTERM-NUM]. */
-static const yytype_int16 yydefgoto[] =
+/* YYDEFGOTO[NTERM-NUM]. */
+static const short yydefgoto[] =
{
-1, 94, 312, 329, 330, 331, 255, 272, 332, 333,
219, 220, 243, 221, 25, 15, 63, 555, 359, 454,
@@ -2882,7 +2748,7 @@
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
#define YYPACT_NINF -542
-static const yytype_int16 yypact[] =
+static const short yypact[] =
{
-542, 13, 162, 567, -542, -542, -542, -542, -542, -542,
-542, -542, -542, -542, 83, -542, 19, -542, -542, -14,
@@ -2948,7 +2814,7 @@
};
/* YYPGOTO[NTERM-NUM]. */
-static const yytype_int16 yypgoto[] =
+static const short yypgoto[] =
{
-542, -542, -542, 435, 439, 441, 191, 197, 442, 445,
-119, -116, -541, -542, 478, 489, -107, -542, -267, 37,
@@ -2966,7 +2832,7 @@
number is the opposite. If zero, do what YYDEFACT says.
If YYTABLE_NINF, syntax error. */
#define YYTABLE_NINF -180
-static const yytype_int16 yytable[] =
+static const short yytable[] =
{
97, 241, 227, 110, 242, 230, 223, 361, 197, 31,
111, 26, 449, 4, 244, 204, 34, 578, 97, 201,
@@ -3134,7 +3000,7 @@
175
};
-static const yytype_int16 yycheck[] =
+static const short yycheck[] =
{
45, 120, 115, 63, 120, 118, 107, 274, 4, 23,
29, 3, 161, 0, 121, 164, 30, 558, 63, 93,
@@ -3304,7 +3170,7 @@
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
-static const yytype_uint8 yystos[] =
+static const unsigned char yystos[] =
{
0, 200, 201, 202, 0, 25, 31, 41, 42, 43,
44, 45, 46, 47, 62, 181, 219, 222, 224, 232,
@@ -3369,6 +3235,22 @@
235, 230, 21, 21, 230, 230
};
+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+# define YYSIZE_T __SIZE_TYPE__
+#endif
+#if ! defined (YYSIZE_T) && defined (size_t)
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T)
+# if defined (__STDC__) || defined (__cplusplus)
+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
+# endif
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
+#endif
+
#define yyerrok (yyerrstatus = 0)
#define yyclearin (yychar = YYEMPTY)
#define YYEMPTY (-2)
@@ -3394,63 +3276,30 @@
yychar = (Token); \
yylval = (Value); \
yytoken = YYTRANSLATE (yychar); \
- YYPOPSTACK (1); \
+ YYPOPSTACK; \
goto yybackup; \
} \
else \
- { \
- yyerror (YY_("syntax error: cannot back up")); \
+ { \
+ yyerror ("syntax error: cannot back up");\
YYERROR; \
} \
-while (YYID (0))
-
+while (0)
#define YYTERROR 1
#define YYERRCODE 256
+/* YYLLOC_DEFAULT -- Compute the default location (before the actions
+ are run). */
-/* 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))
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ ((Current).first_line = (Rhs)[1].first_line, \
+ (Current).first_column = (Rhs)[1].first_column, \
+ (Current).last_line = (Rhs)[N].last_line, \
+ (Current).last_column = (Rhs)[N].last_column)
#endif
-
-/* 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
-
-
/* YYLEX -- calling `yylex' with the right arguments. */
#ifdef YYLEX_PARAM
@@ -3471,96 +3320,42 @@
do { \
if (yydebug) \
YYFPRINTF Args; \
-} while (YYID (0))
+} while (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))
+# define YYDSYMPRINT(Args) \
+do { \
+ if (yydebug) \
+ yysymprint Args; \
+} while (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;
- }
-}
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT. |
-`--------------------------------*/
-
-#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, ")");
-}
+# define YYDSYMPRINTF(Title, Token, Value, Location) \
+do { \
+ if (yydebug) \
+ { \
+ YYFPRINTF (stderr, "%s ", Title); \
+ yysymprint (stderr, \
+ Token, Value); \
+ YYFPRINTF (stderr, "\n"); \
+ } \
+} while (0)
/*------------------------------------------------------------------.
| yy_stack_print -- Print the state stack from its BOTTOM up to its |
| TOP (included). |
`------------------------------------------------------------------*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+#if defined (__STDC__) || defined (__cplusplus)
static void
-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+yy_stack_print (short *bottom, short *top)
#else
static void
yy_stack_print (bottom, top)
- yytype_int16 *bottom;
- yytype_int16 *top;
+ short *bottom;
+ short *top;
#endif
{
YYFPRINTF (stderr, "Stack now");
- for (; bottom <= top; ++bottom)
+ for (/* Nothing. */; bottom <= top; ++bottom)
YYFPRINTF (stderr, " %d", *bottom);
YYFPRINTF (stderr, "\n");
}
@@ -3569,52 +3364,45 @@
do { \
if (yydebug) \
yy_stack_print ((Bottom), (Top)); \
-} while (YYID (0))
+} while (0)
/*------------------------------------------------.
| Report that the YYRULE is going to be reduced. |
`------------------------------------------------*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+#if defined (__STDC__) || defined (__cplusplus)
static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+yy_reduce_print (int yyrule)
#else
static void
-yy_reduce_print (yyvsp, yyrule)
- YYSTYPE *yyvsp;
+yy_reduce_print (yyrule)
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");
- }
+ unsigned int yylno = yyrline[yyrule];
+ YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
+ yyrule - 1, yylno);
+ /* Print the symbols being reduced, and their result. */
+ for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
+ YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
+ YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
}
# define YY_REDUCE_PRINT(Rule) \
do { \
if (yydebug) \
- yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
+ yy_reduce_print (Rule); \
+} while (0)
/* 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 YYDSYMPRINT(Args)
+# define YYDSYMPRINTF(Title, Token, Value, Location)
# define YY_STACK_PRINT(Bottom, Top)
# define YY_REDUCE_PRINT(Rule)
#endif /* !YYDEBUG */
@@ -3629,9 +3417,13 @@
if the built-in stack extension method is used).
Do not make this value too large; the results are undefined if
- YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+ SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
evaluated with infinite-precision integer arithmetic. */
+#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
+# undef YYMAXDEPTH
+#endif
+
#ifndef YYMAXDEPTH
# define YYMAXDEPTH 10000
#endif
@@ -3641,47 +3433,45 @@
#if YYERROR_VERBOSE
# ifndef yystrlen
-# if defined __GLIBC__ && defined _STRING_H
+# 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
+# if defined (__STDC__) || defined (__cplusplus)
yystrlen (const char *yystr)
-#else
-static YYSIZE_T
+# else
yystrlen (yystr)
- const char *yystr;
-#endif
+ const char *yystr;
+# endif
{
- YYSIZE_T yylen;
- for (yylen = 0; yystr[yylen]; yylen++)
+ register const char *yys = yystr;
+
+ while (*yys++ != '\0')
continue;
- return yylen;
+
+ return yys - yystr - 1;
}
# endif
# endif
# ifndef yystpcpy
-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+# 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 *
+# if defined (__STDC__) || defined (__cplusplus)
yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
+# else
yystpcpy (yydest, yysrc)
- char *yydest;
- const char *yysrc;
-#endif
+ char *yydest;
+ const char *yysrc;
+# endif
{
- char *yyd = yydest;
- const char *yys = yysrc;
+ register char *yyd = yydest;
+ register const char *yys = yysrc;
while ((*yyd++ = *yys++) != '\0')
continue;
@@ -3691,192 +3481,70 @@
# 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;
+#endif /* !YYERROR_VERBOSE */
- 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: ;
- }
-
- if (! yyres)
- return yystrlen (yystr);
-
- 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)
-{
- int yyn = yypact[yystate];
-
- 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. |
-`-----------------------------------------------*/
+#if YYDEBUG
+/*--------------------------------.
+| Print this symbol on YYOUTPUT. |
+`--------------------------------*/
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+#if defined (__STDC__) || defined (__cplusplus)
static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
#else
static void
-yydestruct (yymsg, yytype, yyvaluep)
- const char *yymsg;
+yysymprint (yyoutput, yytype, yyvaluep)
+ FILE *yyoutput;
int yytype;
YYSTYPE *yyvaluep;
#endif
{
- YYUSE (yyvaluep);
+ /* Pacify ``unused variable'' warnings. */
+ (void) yyvaluep;
- if (!yymsg)
- yymsg = "Deleting";
- YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+ if (yytype < YYNTOKENS)
+ {
+ YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+# ifdef YYPRINT
+ YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+ }
+ else
+ YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+ switch (yytype)
+ {
+ default:
+ break;
+ }
+ YYFPRINTF (yyoutput, ")");
+}
+
+#endif /* ! YYDEBUG */
+/*-----------------------------------------------.
+| Release the memory associated to this symbol. |
+`-----------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yydestruct (int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yytype, yyvaluep)
+ int yytype;
+ YYSTYPE *yyvaluep;
+#endif
+{
+ /* Pacify ``unused variable'' warnings. */
+ (void) yyvaluep;
switch (yytype)
{
default:
- break;
+ break;
}
}
@@ -3884,13 +3552,13 @@
/* Prevent warnings from -Wmissing-prototypes. */
#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
+# if defined (__STDC__) || defined (__cplusplus)
int yyparse (void *YYPARSE_PARAM);
-#else
+# else
int yyparse ();
-#endif
+# endif
#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
+#if defined (__STDC__) || defined (__cplusplus)
int yyparse (void);
#else
int yyparse ();
@@ -3899,10 +3567,10 @@
-/* The look-ahead symbol. */
+/* The lookahead symbol. */
int yychar;
-/* The semantic value of the look-ahead symbol. */
+/* The semantic value of the lookahead symbol. */
YYSTYPE yylval;
/* Number of syntax errors so far. */
@@ -3915,18 +3583,14 @@
`----------*/
#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
- void *YYPARSE_PARAM;
-#endif
+# if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void *YYPARSE_PARAM)
+# else
+int yyparse (YYPARSE_PARAM)
+ void *YYPARSE_PARAM;
+# endif
#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+#if defined (__STDC__) || defined (__cplusplus)
int
yyparse (void)
#else
@@ -3937,19 +3601,13 @@
#endif
{
- int yystate;
- int yyn;
+ register int yystate;
+ register int yyn;
int yyresult;
/* Number of tokens to shift before error messages enabled. */
int yyerrstatus;
- /* Look-ahead token as an internal (translated) token number. */
+ /* Lookahead 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
/* Three stacks and their tools:
`yyss': related to states,
@@ -3960,18 +3618,18 @@
to reallocate them elsewhere. */
/* The state stack. */
- yytype_int16 yyssa[YYINITDEPTH];
- yytype_int16 *yyss = yyssa;
- yytype_int16 *yyssp;
+ short yyssa[YYINITDEPTH];
+ short *yyss = yyssa;
+ register short *yyssp;
/* The semantic value stack. */
YYSTYPE yyvsa[YYINITDEPTH];
YYSTYPE *yyvs = yyvsa;
- YYSTYPE *yyvsp;
+ register YYSTYPE *yyvsp;
-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
+#define YYPOPSTACK (yyvsp--, yyssp--)
YYSIZE_T yystacksize = YYINITDEPTH;
@@ -3980,9 +3638,9 @@
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;
+ /* When reducing, the number of symbols on the RHS of the reduced
+ rule. */
+ int yylen;
YYDPRINTF ((stderr, "Starting parse\n"));
@@ -4006,7 +3664,8 @@
`------------------------------------------------------------*/
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. */
+ have just been pushed. so pushing a state here evens the stacks.
+ */
yyssp++;
yysetstate:
@@ -4019,18 +3678,18 @@
#ifdef yyoverflow
{
- /* Give user a chance to reallocate the stack. Use copies of
+ /* 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;
+ short *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"),
+ yyoverflow ("parser stack overflow",
&yyss1, yysize * sizeof (*yyssp),
&yyvs1, yysize * sizeof (*yyvsp),
@@ -4041,21 +3700,21 @@
}
#else /* no yyoverflow */
# ifndef YYSTACK_RELOCATE
- goto yyexhaustedlab;
+ goto yyoverflowlab;
# else
/* Extend the stack our own way. */
if (YYMAXDEPTH <= yystacksize)
- goto yyexhaustedlab;
+ goto yyoverflowlab;
yystacksize *= 2;
if (YYMAXDEPTH < yystacksize)
yystacksize = YYMAXDEPTH;
{
- yytype_int16 *yyss1 = yyss;
+ short *yyss1 = yyss;
union yyalloc *yyptr =
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
- goto yyexhaustedlab;
+ goto yyoverflowlab;
YYSTACK_RELOCATE (yyss);
YYSTACK_RELOCATE (yyvs);
@@ -4086,17 +3745,19 @@
`-----------*/
yybackup:
- /* Do appropriate processing given the current state. Read a
- look-ahead token if we need one and don't already have one. */
+/* Do appropriate processing given the current state. */
+/* Read a lookahead token if we need one and don't already have one. */
+/* yyresume: */
- /* First try to decide what to do without reference to look-ahead token. */
+ /* First try to decide what to do without reference to lookahead token. */
+
yyn = yypact[yystate];
if (yyn == YYPACT_NINF)
goto yydefault;
- /* Not known => get a look-ahead token if don't already have one. */
+ /* Not known => get a lookahead token if don't already have one. */
- /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
@@ -4111,7 +3772,7 @@
else
{
yytoken = YYTRANSLATE (yychar);
- YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+ YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
}
/* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -4131,21 +3792,22 @@
if (yyn == YYFINAL)
YYACCEPT;
+ /* Shift the lookahead token. */
+ YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
+
+ /* Discard the token being shifted unless it is eof. */
+ if (yychar != YYEOF)
+ yychar = YYEMPTY;
+
+ *++yyvsp = yylval;
+
+
/* Count tokens shifted since error; after three, turn off error
status. */
if (yyerrstatus)
yyerrstatus--;
- /* Shift the look-ahead token. */
- YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-
- /* Discard the shifted token unless it is eof. */
- if (yychar != YYEOF)
- yychar = YYEMPTY;
-
yystate = yyn;
- *++yyvsp = yylval;
-
goto yynewstate;
@@ -4181,399 +3843,399 @@
switch (yyn)
{
case 3:
-#line 1889 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 1891 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if ((yyvsp[(1) - (1)].UIntVal) > (uint32_t)INT32_MAX) // Outside of my range!
+ if (yyvsp[0].UIntVal > (uint32_t)INT32_MAX) // Outside of my range!
error("Value too large for type");
- (yyval.SIntVal) = (int32_t)(yyvsp[(1) - (1)].UIntVal);
+ yyval.SIntVal = (int32_t)yyvsp[0].UIntVal;
;}
break;
case 5:
-#line 1898 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 1900 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if ((yyvsp[(1) - (1)].UInt64Val) > (uint64_t)INT64_MAX) // Outside of my range!
+ if (yyvsp[0].UInt64Val > (uint64_t)INT64_MAX) // Outside of my range!
error("Value too large for type");
- (yyval.SInt64Val) = (int64_t)(yyvsp[(1) - (1)].UInt64Val);
+ yyval.SInt64Val = (int64_t)yyvsp[0].UInt64Val;
;}
break;
case 26:
-#line 1920 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.IPred) = ICmpInst::ICMP_EQ; ;}
+#line 1922 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.IPred = ICmpInst::ICMP_EQ; ;}
break;
case 27:
-#line 1920 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.IPred) = ICmpInst::ICMP_NE; ;}
+#line 1922 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.IPred = ICmpInst::ICMP_NE; ;}
break;
case 28:
-#line 1921 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.IPred) = ICmpInst::ICMP_SLT; ;}
+#line 1923 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.IPred = ICmpInst::ICMP_SLT; ;}
break;
case 29:
-#line 1921 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.IPred) = ICmpInst::ICMP_SGT; ;}
+#line 1923 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.IPred = ICmpInst::ICMP_SGT; ;}
break;
case 30:
-#line 1922 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.IPred) = ICmpInst::ICMP_SLE; ;}
+#line 1924 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.IPred = ICmpInst::ICMP_SLE; ;}
break;
case 31:
-#line 1922 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.IPred) = ICmpInst::ICMP_SGE; ;}
+#line 1924 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.IPred = ICmpInst::ICMP_SGE; ;}
break;
case 32:
-#line 1923 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.IPred) = ICmpInst::ICMP_ULT; ;}
+#line 1925 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.IPred = ICmpInst::ICMP_ULT; ;}
break;
case 33:
-#line 1923 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.IPred) = ICmpInst::ICMP_UGT; ;}
+#line 1925 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.IPred = ICmpInst::ICMP_UGT; ;}
break;
case 34:
-#line 1924 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.IPred) = ICmpInst::ICMP_ULE; ;}
+#line 1926 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.IPred = ICmpInst::ICMP_ULE; ;}
break;
case 35:
-#line 1924 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.IPred) = ICmpInst::ICMP_UGE; ;}
+#line 1926 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.IPred = ICmpInst::ICMP_UGE; ;}
break;
case 36:
-#line 1928 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.FPred) = FCmpInst::FCMP_OEQ; ;}
+#line 1930 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.FPred = FCmpInst::FCMP_OEQ; ;}
break;
case 37:
-#line 1928 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.FPred) = FCmpInst::FCMP_ONE; ;}
+#line 1930 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.FPred = FCmpInst::FCMP_ONE; ;}
break;
case 38:
-#line 1929 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.FPred) = FCmpInst::FCMP_OLT; ;}
+#line 1931 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.FPred = FCmpInst::FCMP_OLT; ;}
break;
case 39:
-#line 1929 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.FPred) = FCmpInst::FCMP_OGT; ;}
+#line 1931 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.FPred = FCmpInst::FCMP_OGT; ;}
break;
case 40:
-#line 1930 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.FPred) = FCmpInst::FCMP_OLE; ;}
+#line 1932 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.FPred = FCmpInst::FCMP_OLE; ;}
break;
case 41:
-#line 1930 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.FPred) = FCmpInst::FCMP_OGE; ;}
+#line 1932 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.FPred = FCmpInst::FCMP_OGE; ;}
break;
case 42:
-#line 1931 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.FPred) = FCmpInst::FCMP_ORD; ;}
+#line 1933 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.FPred = FCmpInst::FCMP_ORD; ;}
break;
case 43:
-#line 1931 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.FPred) = FCmpInst::FCMP_UNO; ;}
+#line 1933 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.FPred = FCmpInst::FCMP_UNO; ;}
break;
case 44:
-#line 1932 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.FPred) = FCmpInst::FCMP_UEQ; ;}
+#line 1934 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.FPred = FCmpInst::FCMP_UEQ; ;}
break;
case 45:
-#line 1932 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.FPred) = FCmpInst::FCMP_UNE; ;}
+#line 1934 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.FPred = FCmpInst::FCMP_UNE; ;}
break;
case 46:
-#line 1933 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.FPred) = FCmpInst::FCMP_ULT; ;}
+#line 1935 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.FPred = FCmpInst::FCMP_ULT; ;}
break;
case 47:
-#line 1933 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.FPred) = FCmpInst::FCMP_UGT; ;}
+#line 1935 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.FPred = FCmpInst::FCMP_UGT; ;}
break;
case 48:
-#line 1934 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.FPred) = FCmpInst::FCMP_ULE; ;}
+#line 1936 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.FPred = FCmpInst::FCMP_ULE; ;}
break;
case 49:
-#line 1934 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.FPred) = FCmpInst::FCMP_UGE; ;}
+#line 1936 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.FPred = FCmpInst::FCMP_UGE; ;}
break;
case 50:
-#line 1935 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.FPred) = FCmpInst::FCMP_TRUE; ;}
+#line 1937 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.FPred = FCmpInst::FCMP_TRUE; ;}
break;
case 51:
-#line 1936 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.FPred) = FCmpInst::FCMP_FALSE; ;}
+#line 1938 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.FPred = FCmpInst::FCMP_FALSE; ;}
break;
case 81:
-#line 1967 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 1969 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
+ yyval.StrVal = yyvsp[-1].StrVal;
;}
break;
case 82:
-#line 1970 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 1972 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.StrVal) = 0;
+ yyval.StrVal = 0;
;}
break;
case 83:
-#line 1975 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
+#line 1977 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.Linkage = GlobalValue::InternalLinkage; ;}
break;
case 84:
-#line 1976 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
+#line 1978 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.Linkage = GlobalValue::LinkOnceLinkage; ;}
break;
case 85:
-#line 1977 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
+#line 1979 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.Linkage = GlobalValue::WeakLinkage; ;}
break;
case 86:
-#line 1978 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
+#line 1980 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.Linkage = GlobalValue::AppendingLinkage; ;}
break;
case 87:
-#line 1979 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
+#line 1981 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.Linkage = GlobalValue::DLLImportLinkage; ;}
break;
case 88:
-#line 1980 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
+#line 1982 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.Linkage = GlobalValue::DLLExportLinkage; ;}
break;
case 89:
-#line 1981 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
+#line 1983 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.Linkage = GlobalValue::ExternalWeakLinkage; ;}
break;
case 90:
-#line 1982 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
+#line 1984 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.Linkage = GlobalValue::ExternalLinkage; ;}
break;
case 91:
-#line 1986 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.UIntVal) = lastCallingConv = OldCallingConv::C; ;}
+#line 1988 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.UIntVal = lastCallingConv = OldCallingConv::C; ;}
break;
case 92:
-#line 1987 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.UIntVal) = lastCallingConv = OldCallingConv::C; ;}
+#line 1989 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.UIntVal = lastCallingConv = OldCallingConv::C; ;}
break;
case 93:
-#line 1988 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.UIntVal) = lastCallingConv = OldCallingConv::CSRet; ;}
+#line 1990 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.UIntVal = lastCallingConv = OldCallingConv::CSRet; ;}
break;
case 94:
-#line 1989 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.UIntVal) = lastCallingConv = OldCallingConv::Fast; ;}
+#line 1991 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.UIntVal = lastCallingConv = OldCallingConv::Fast; ;}
break;
case 95:
-#line 1990 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.UIntVal) = lastCallingConv = OldCallingConv::Cold; ;}
+#line 1992 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.UIntVal = lastCallingConv = OldCallingConv::Cold; ;}
break;
case 96:
-#line 1991 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.UIntVal) = lastCallingConv = OldCallingConv::X86_StdCall; ;}
+#line 1993 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.UIntVal = lastCallingConv = OldCallingConv::X86_StdCall; ;}
break;
case 97:
-#line 1992 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.UIntVal) = lastCallingConv = OldCallingConv::X86_FastCall; ;}
+#line 1994 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.UIntVal = lastCallingConv = OldCallingConv::X86_FastCall; ;}
break;
case 98:
-#line 1993 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 1995 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
+ if ((unsigned)yyvsp[0].UInt64Val != yyvsp[0].UInt64Val)
error("Calling conv too large");
- (yyval.UIntVal) = lastCallingConv = (yyvsp[(2) - (2)].UInt64Val);
+ yyval.UIntVal = lastCallingConv = yyvsp[0].UInt64Val;
;}
break;
case 99:
-#line 2003 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.UIntVal) = 0; ;}
+#line 2005 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.UIntVal = 0; ;}
break;
case 100:
-#line 2004 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2006 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val);
- if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
+ yyval.UIntVal = yyvsp[0].UInt64Val;
+ if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
error("Alignment must be a power of two");
;}
break;
case 101:
-#line 2012 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.UIntVal) = 0; ;}
+#line 2014 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.UIntVal = 0; ;}
break;
case 102:
-#line 2013 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2015 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val);
- if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
+ yyval.UIntVal = yyvsp[0].UInt64Val;
+ if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
error("Alignment must be a power of two");
;}
break;
case 103:
-#line 2021 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2023 "/users/dag/projects/cascade/llvm.modified/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] == '\\')
+ for (unsigned i = 0, e = strlen(yyvsp[0].StrVal); i != e; ++i)
+ if (yyvsp[0].StrVal[i] == '"' || yyvsp[0].StrVal[i] == '\\')
error("Invalid character in section name");
- (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal);
+ yyval.StrVal = yyvsp[0].StrVal;
;}
break;
case 104:
-#line 2030 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.StrVal) = 0; ;}
+#line 2032 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.StrVal = 0; ;}
break;
case 105:
-#line 2031 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;}
+#line 2033 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.StrVal = yyvsp[0].StrVal; ;}
break;
case 106:
-#line 2038 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2040 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{;}
break;
case 107:
-#line 2039 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2041 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{;}
break;
case 108:
-#line 2043 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2045 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- CurGV->setSection((yyvsp[(1) - (1)].StrVal));
- free((yyvsp[(1) - (1)].StrVal));
+ CurGV->setSection(yyvsp[0].StrVal);
+ free(yyvsp[0].StrVal);
;}
break;
case 109:
-#line 2047 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2049 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if ((yyvsp[(2) - (2)].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[(2) - (2)].UInt64Val)))
+ if (yyvsp[0].UInt64Val != 0 && !isPowerOf2_32(yyvsp[0].UInt64Val))
error("Alignment must be a power of two");
- CurGV->setAlignment((yyvsp[(2) - (2)].UInt64Val));
+ CurGV->setAlignment(yyvsp[0].UInt64Val);
;}
break;
case 111:
-#line 2064 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2066 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[(1) - (1)].PrimType).T);
- (yyval.TypeVal).S.makeSignless();
+ yyval.TypeVal.PAT = new PATypeHolder(yyvsp[0].PrimType.T);
+ yyval.TypeVal.S.makeSignless();
;}
break;
case 113:
-#line 2072 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2074 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[(1) - (1)].PrimType).T);
- (yyval.TypeVal).S.makeSignless();
+ yyval.TypeVal.PAT = new PATypeHolder(yyvsp[0].PrimType.T);
+ yyval.TypeVal.S.makeSignless();
;}
break;
case 114:
-#line 2079 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2081 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
if (!UpRefs.empty())
- error("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal).PAT)->getDescription());
- (yyval.TypeVal) = (yyvsp[(1) - (1)].TypeVal);
+ error("Invalid upreference in type: " + (*yyvsp[0].TypeVal.PAT)->getDescription());
+ yyval.TypeVal = yyvsp[0].TypeVal;
;}
break;
case 127:
-#line 2093 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2095 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[(1) - (1)].PrimType).T);
- (yyval.TypeVal).S.copy((yyvsp[(1) - (1)].PrimType).S);
+ yyval.TypeVal.PAT = new PATypeHolder(yyvsp[0].PrimType.T);
+ yyval.TypeVal.S.copy(yyvsp[0].PrimType.S);
;}
break;
case 128:
-#line 2097 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2099 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.TypeVal).PAT = new PATypeHolder(OpaqueType::get());
- (yyval.TypeVal).S.makeSignless();
+ yyval.TypeVal.PAT = new PATypeHolder(OpaqueType::get());
+ yyval.TypeVal.S.makeSignless();
;}
break;
case 129:
-#line 2101 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2103 "/users/dag/projects/cascade/llvm.modified/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);
+ yyval.TypeVal.S.copy(getTypeSign(yyvsp[0].ValIDVal));
+ const Type* tmp = getType(yyvsp[0].ValIDVal);
+ yyval.TypeVal.PAT = new PATypeHolder(tmp);
;}
break;
case 130:
-#line 2106 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2108 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Type UpReference
- if ((yyvsp[(2) - (2)].UInt64Val) > (uint64_t)~0U)
+ if (yyvsp[0].UInt64Val > (uint64_t)~0U)
error("Value out of range");
OpaqueType *OT = OpaqueType::get(); // Use temporary placeholder
- UpRefs.push_back(UpRefRecord((unsigned)(yyvsp[(2) - (2)].UInt64Val), OT)); // Add to vector...
- (yyval.TypeVal).PAT = new PATypeHolder(OT);
- (yyval.TypeVal).S.makeSignless();
+ UpRefs.push_back(UpRefRecord((unsigned)yyvsp[0].UInt64Val, OT)); // Add to vector...
+ yyval.TypeVal.PAT = new PATypeHolder(OT);
+ yyval.TypeVal.S.makeSignless();
UR_OUT("New Upreference!\n");
;}
break;
case 131:
-#line 2115 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2117 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Function derived type?
- (yyval.TypeVal).S.makeComposite((yyvsp[(1) - (4)].TypeVal).S);
+ yyval.TypeVal.S.makeComposite(yyvsp[-3].TypeVal.S);
std::vector<const Type*> Params;
- for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp[(3) - (4)].TypeList)->begin(),
- E = (yyvsp[(3) - (4)].TypeList)->end(); I != E; ++I) {
+ for (std::list<llvm::PATypeInfo>::iterator I = yyvsp[-1].TypeList->begin(),
+ E = yyvsp[-1].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();
@@ -4588,164 +4250,164 @@
}
const FunctionType *FTy =
- FunctionType::get((yyvsp[(1) - (4)].TypeVal).PAT->get(), Params, isVarArg, PAL);
+ FunctionType::get(yyvsp[-3].TypeVal.PAT->get(), Params, isVarArg, PAL);
- (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
+ 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 132:
-#line 2142 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2144 "/users/dag/projects/cascade/llvm.modified/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;
+ 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 133:
-#line 2148 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2150 "/users/dag/projects/cascade/llvm.modified/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))
+ const llvm::Type* ElemTy = yyvsp[-1].TypeVal.PAT->get();
+ if ((unsigned)yyvsp[-3].UInt64Val != yyvsp[-3].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[(2) - (5)].UInt64Val)))
+ if (!isPowerOf2_32(yyvsp[-3].UInt64Val))
error("VectorType length should be a power of 2");
- (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;
+ 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 134:
-#line 2161 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2163 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Structure type?
std::vector<const Type*> Elements;
- (yyval.TypeVal).S.makeComposite();
- for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(),
- E = (yyvsp[(2) - (3)].TypeList)->end(); I != E; ++I) {
+ yyval.TypeVal.S.makeComposite();
+ for (std::list<llvm::PATypeInfo>::iterator I = yyvsp[-1].TypeList->begin(),
+ E = yyvsp[-1].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[(2) - (3)].TypeList);
+ yyval.TypeVal.PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements), yyval.TypeVal.S));
+ delete yyvsp[-1].TypeList;
;}
break;
case 135:
-#line 2172 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2174 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Empty structure type?
- (yyval.TypeVal).PAT = new PATypeHolder(StructType::get(std::vector<const Type*>()));
- (yyval.TypeVal).S.makeComposite();
+ yyval.TypeVal.PAT = new PATypeHolder(StructType::get(std::vector<const Type*>()));
+ yyval.TypeVal.S.makeComposite();
;}
break;
case 136:
-#line 2176 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2178 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Packed Structure type?
- (yyval.TypeVal).S.makeComposite();
+ yyval.TypeVal.S.makeComposite();
std::vector<const Type*> Elements;
- for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(),
- E = (yyvsp[(3) - (5)].TypeList)->end(); I != E; ++I) {
+ for (std::list<llvm::PATypeInfo>::iterator I = yyvsp[-2].TypeList->begin(),
+ E = yyvsp[-2].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[(3) - (5)].TypeList);
+ yyval.TypeVal.PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true),
+ yyval.TypeVal.S));
+ delete yyvsp[-2].TypeList;
;}
break;
case 137:
-#line 2189 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2191 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Empty packed structure type?
- (yyval.TypeVal).PAT = new PATypeHolder(StructType::get(std::vector<const Type*>(),true));
- (yyval.TypeVal).S.makeComposite();
+ yyval.TypeVal.PAT = new PATypeHolder(StructType::get(std::vector<const Type*>(),true));
+ yyval.TypeVal.S.makeComposite();
;}
break;
case 138:
-#line 2193 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2195 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Pointer type?
- if ((yyvsp[(1) - (2)].TypeVal).PAT->get() == Type::LabelTy)
+ if (yyvsp[-1].TypeVal.PAT->get() == Type::LabelTy)
error("Cannot form a pointer to a basic block");
- (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;
+ 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 139:
-#line 2207 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2209 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.TypeList) = new std::list<PATypeInfo>();
- (yyval.TypeList)->push_back((yyvsp[(1) - (1)].TypeVal));
+ yyval.TypeList = new std::list<PATypeInfo>();
+ yyval.TypeList->push_back(yyvsp[0].TypeVal);
;}
break;
case 140:
-#line 2211 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2213 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back((yyvsp[(3) - (3)].TypeVal));
+ (yyval.TypeList=yyvsp[-2].TypeList)->push_back(yyvsp[0].TypeVal);
;}
break;
case 142:
-#line 2219 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2221 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
PATypeInfo VoidTI;
VoidTI.PAT = new PATypeHolder(Type::VoidTy);
VoidTI.S.makeSignless();
- ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(VoidTI);
+ (yyval.TypeList=yyvsp[-2].TypeList)->push_back(VoidTI);
;}
break;
case 143:
-#line 2225 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2227 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.TypeList) = new std::list<PATypeInfo>();
+ yyval.TypeList = new std::list<PATypeInfo>();
PATypeInfo VoidTI;
VoidTI.PAT = new PATypeHolder(Type::VoidTy);
VoidTI.S.makeSignless();
- (yyval.TypeList)->push_back(VoidTI);
+ yyval.TypeList->push_back(VoidTI);
;}
break;
case 144:
-#line 2232 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2234 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.TypeList) = new std::list<PATypeInfo>();
+ yyval.TypeList = new std::list<PATypeInfo>();
;}
break;
case 145:
-#line 2244 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2246 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Nonempty unsized arr
- const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[(1) - (4)].TypeVal).PAT->get());
+ const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-3].TypeVal.PAT->get());
if (ATy == 0)
error("Cannot make array constant with type: '" +
- (yyvsp[(1) - (4)].TypeVal).PAT->get()->getDescription() + "'");
+ yyvsp[-3].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[(3) - (4)].ConstVector)->size())
+ if (NumElements != -1 && NumElements != (int)yyvsp[-1].ConstVector->size())
error("Type mismatch: constant sized array initialized with " +
- utostr((yyvsp[(3) - (4)].ConstVector)->size()) + " arguments, but has size of " +
+ utostr(yyvsp[-1].ConstVector->size()) + " arguments, but has size of " +
itostr(NumElements) + "");
// Verify all elements are correct type!
std::vector<Constant*> Elems;
- for (unsigned i = 0; i < (yyvsp[(3) - (4)].ConstVector)->size(); i++) {
- Constant *C = (*(yyvsp[(3) - (4)].ConstVector))[i].C;
+ for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) {
+ Constant *C = (*yyvsp[-1].ConstVector)[i].C;
const Type* ValTy = C->getType();
if (ETy != ValTy)
error("Element #" + utostr(i) + " is not of type '" +
@@ -4753,75 +4415,75 @@
ValTy->getDescription() + "'");
Elems.push_back(C);
}
- (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);
+ 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 146:
-#line 2274 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2276 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[(1) - (3)].TypeVal).PAT->get());
+ const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-2].TypeVal.PAT->get());
if (ATy == 0)
error("Cannot make array constant with type: '" +
- (yyvsp[(1) - (3)].TypeVal).PAT->get()->getDescription() + "'");
+ yyvsp[-2].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<Constant*>());
- (yyval.ConstVal).S.copy((yyvsp[(1) - (3)].TypeVal).S);
- delete (yyvsp[(1) - (3)].TypeVal).PAT;
+ yyval.ConstVal.C = ConstantArray::get(ATy, std::vector<Constant*>());
+ yyval.ConstVal.S.copy(yyvsp[-2].TypeVal.S);
+ delete yyvsp[-2].TypeVal.PAT;
;}
break;
case 147:
-#line 2287 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2289 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[(1) - (3)].TypeVal).PAT->get());
+ const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-2].TypeVal.PAT->get());
if (ATy == 0)
error("Cannot make array constant with type: '" +
- (yyvsp[(1) - (3)].TypeVal).PAT->get()->getDescription() + "'");
+ yyvsp[-2].TypeVal.PAT->get()->getDescription() + "'");
int NumElements = ATy->getNumElements();
const Type *ETy = dyn_cast<IntegerType>(ATy->getElementType());
if (!ETy || cast<IntegerType>(ETy)->getBitWidth() != 8)
error("String arrays require type i8, not '" + ETy->getDescription() +
"'");
- char *EndStr = UnEscapeLexed((yyvsp[(3) - (3)].StrVal), true);
- if (NumElements != -1 && NumElements != (EndStr-(yyvsp[(3) - (3)].StrVal)))
+ char *EndStr = UnEscapeLexed(yyvsp[0].StrVal, true);
+ if (NumElements != -1 && NumElements != (EndStr-yyvsp[0].StrVal))
error("Can't build string constant of size " +
- itostr((int)(EndStr-(yyvsp[(3) - (3)].StrVal))) + " when array has size " +
+ itostr((int)(EndStr-yyvsp[0].StrVal)) + " when array has size " +
itostr(NumElements) + "");
std::vector<Constant*> Vals;
- for (char *C = (char *)(yyvsp[(3) - (3)].StrVal); C != (char *)EndStr; ++C)
+ for (char *C = (char *)yyvsp[0].StrVal; C != (char *)EndStr; ++C)
Vals.push_back(ConstantInt::get(ETy, *C));
- 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;
+ 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 148:
-#line 2310 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2312 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Nonempty unsized arr
- const VectorType *PTy = dyn_cast<VectorType>((yyvsp[(1) - (4)].TypeVal).PAT->get());
+ const VectorType *PTy = dyn_cast<VectorType>(yyvsp[-3].TypeVal.PAT->get());
if (PTy == 0)
error("Cannot make packed constant with type: '" +
- (yyvsp[(1) - (4)].TypeVal).PAT->get()->getDescription() + "'");
+ yyvsp[-3].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[(3) - (4)].ConstVector)->size())
+ if (NumElements != -1 && NumElements != (int)yyvsp[-1].ConstVector->size())
error("Type mismatch: constant sized packed initialized with " +
- utostr((yyvsp[(3) - (4)].ConstVector)->size()) + " arguments, but has size of " +
+ utostr(yyvsp[-1].ConstVector->size()) + " arguments, but has size of " +
itostr(NumElements) + "");
// Verify all elements are correct type!
std::vector<Constant*> Elems;
- for (unsigned i = 0; i < (yyvsp[(3) - (4)].ConstVector)->size(); i++) {
- Constant *C = (*(yyvsp[(3) - (4)].ConstVector))[i].C;
+ for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) {
+ Constant *C = (*yyvsp[-1].ConstVector)[i].C;
const Type* ValTy = C->getType();
if (ETy != ValTy)
error("Element #" + utostr(i) + " is not of type '" +
@@ -4829,124 +4491,124 @@
ValTy->getDescription() + "'");
Elems.push_back(C);
}
- (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);
+ 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 149:
-#line 2338 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2340 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (4)].TypeVal).PAT->get());
+ const StructType *STy = dyn_cast<StructType>(yyvsp[-3].TypeVal.PAT->get());
if (STy == 0)
error("Cannot make struct constant with type: '" +
- (yyvsp[(1) - (4)].TypeVal).PAT->get()->getDescription() + "'");
- if ((yyvsp[(3) - (4)].ConstVector)->size() != STy->getNumContainedTypes())
+ yyvsp[-3].TypeVal.PAT->get()->getDescription() + "'");
+ if (yyvsp[-1].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<Constant*> Fields;
- for (unsigned i = 0, e = (yyvsp[(3) - (4)].ConstVector)->size(); i != e; ++i) {
- Constant *C = (*(yyvsp[(3) - (4)].ConstVector))[i].C;
+ for (unsigned i = 0, e = yyvsp[-1].ConstVector->size(); i != e; ++i) {
+ Constant *C = (*yyvsp[-1].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[(1) - (4)].TypeVal).S);
- delete (yyvsp[(1) - (4)].TypeVal).PAT;
- delete (yyvsp[(3) - (4)].ConstVector);
+ 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 150:
-#line 2360 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2362 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (3)].TypeVal).PAT->get());
+ const StructType *STy = dyn_cast<StructType>(yyvsp[-2].TypeVal.PAT->get());
if (STy == 0)
error("Cannot make struct constant with type: '" +
- (yyvsp[(1) - (3)].TypeVal).PAT->get()->getDescription() + "'");
+ yyvsp[-2].TypeVal.PAT->get()->getDescription() + "'");
if (STy->getNumContainedTypes() != 0)
error("Illegal number of initializers for structure type");
- (yyval.ConstVal).C = ConstantStruct::get(STy, std::vector<Constant*>());
- (yyval.ConstVal).S.copy((yyvsp[(1) - (3)].TypeVal).S);
- delete (yyvsp[(1) - (3)].TypeVal).PAT;
+ yyval.ConstVal.C = ConstantStruct::get(STy, std::vector<Constant*>());
+ yyval.ConstVal.S.copy(yyvsp[-2].TypeVal.S);
+ delete yyvsp[-2].TypeVal.PAT;
;}
break;
case 151:
-#line 2371 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2373 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (6)].TypeVal).PAT->get());
+ const StructType *STy = dyn_cast<StructType>(yyvsp[-5].TypeVal.PAT->get());
if (STy == 0)
error("Cannot make packed struct constant with type: '" +
- (yyvsp[(1) - (6)].TypeVal).PAT->get()->getDescription() + "'");
- if ((yyvsp[(4) - (6)].ConstVector)->size() != STy->getNumContainedTypes())
+ yyvsp[-5].TypeVal.PAT->get()->getDescription() + "'");
+ if (yyvsp[-2].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<Constant*> Fields;
- for (unsigned i = 0, e = (yyvsp[(4) - (6)].ConstVector)->size(); i != e; ++i) {
- Constant *C = (*(yyvsp[(4) - (6)].ConstVector))[i].C;
+ for (unsigned i = 0, e = yyvsp[-2].ConstVector->size(); i != e; ++i) {
+ Constant *C = (*yyvsp[-2].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[(1) - (6)].TypeVal).S);
- delete (yyvsp[(1) - (6)].TypeVal).PAT;
- delete (yyvsp[(4) - (6)].ConstVector);
+ 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 152:
-#line 2393 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2395 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (5)].TypeVal).PAT->get());
+ const StructType *STy = dyn_cast<StructType>(yyvsp[-4].TypeVal.PAT->get());
if (STy == 0)
error("Cannot make packed struct constant with type: '" +
- (yyvsp[(1) - (5)].TypeVal).PAT->get()->getDescription() + "'");
+ yyvsp[-4].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<Constant*>());
- (yyval.ConstVal).S.copy((yyvsp[(1) - (5)].TypeVal).S);
- delete (yyvsp[(1) - (5)].TypeVal).PAT;
+ yyval.ConstVal.C = ConstantStruct::get(STy, std::vector<Constant*>());
+ yyval.ConstVal.S.copy(yyvsp[-4].TypeVal.S);
+ delete yyvsp[-4].TypeVal.PAT;
;}
break;
case 153:
-#line 2404 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2406 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const PointerType *PTy = dyn_cast<PointerType>((yyvsp[(1) - (2)].TypeVal).PAT->get());
+ const PointerType *PTy = dyn_cast<PointerType>(yyvsp[-1].TypeVal.PAT->get());
if (PTy == 0)
error("Cannot make null pointer constant with type: '" +
- (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;
+ 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 154:
-#line 2413 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2415 "/users/dag/projects/cascade/llvm.modified/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;
+ 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 155:
-#line 2418 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2420 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const PointerType *Ty = dyn_cast<PointerType>((yyvsp[(1) - (2)].TypeVal).PAT->get());
+ const PointerType *Ty = dyn_cast<PointerType>(yyvsp[-1].TypeVal.PAT->get());
if (Ty == 0)
error("Global const reference must be a pointer type, not" +
- (yyvsp[(1) - (2)].TypeVal).PAT->get()->getDescription());
+ yyvsp[-1].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
@@ -4957,8 +4619,8 @@
//
Function *SavedCurFn = CurFun.CurrentFunction;
CurFun.CurrentFunction = 0;
- (yyvsp[(2) - (2)].ValIDVal).S.copy((yyvsp[(1) - (2)].TypeVal).S);
- Value *V = getExistingValue(Ty, (yyvsp[(2) - (2)].ValIDVal));
+ yyvsp[0].ValIDVal.S.copy(yyvsp[-1].TypeVal.S);
+ Value *V = getExistingValue(Ty, yyvsp[0].ValIDVal);
CurFun.CurrentFunction = SavedCurFn;
// If this is an initializer for a constant pointer, which is referencing a
@@ -4971,14 +4633,14 @@
// First check to see if the forward references value is already created!
PerModuleInfo::GlobalRefsType::iterator I =
- CurModule.GlobalRefs.find(std::make_pair(PT, (yyvsp[(2) - (2)].ValIDVal)));
+ CurModule.GlobalRefs.find(std::make_pair(PT, yyvsp[0].ValIDVal));
if (I != CurModule.GlobalRefs.end()) {
V = I->second; // Placeholder already exists, use it...
- (yyvsp[(2) - (2)].ValIDVal).destroy();
+ yyvsp[0].ValIDVal.destroy();
} else {
std::string Name;
- if ((yyvsp[(2) - (2)].ValIDVal).Type == ValID::NameVal) Name = (yyvsp[(2) - (2)].ValIDVal).Name;
+ if (yyvsp[0].ValIDVal.Type == ValID::NameVal) Name = yyvsp[0].ValIDVal.Name;
// Create the forward referenced global.
GlobalValue *GV;
@@ -4993,151 +4655,151 @@
}
// 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[(2) - (2)].ValIDVal)), GV));
+ CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, yyvsp[0].ValIDVal), GV));
V = GV;
}
}
- (yyval.ConstVal).C = cast<GlobalValue>(V);
- (yyval.ConstVal).S.copy((yyvsp[(1) - (2)].TypeVal).S);
- delete (yyvsp[(1) - (2)].TypeVal).PAT; // Free the type handle
+ yyval.ConstVal.C = cast<GlobalValue>(V);
+ yyval.ConstVal.S.copy(yyvsp[-1].TypeVal.S);
+ delete yyvsp[-1].TypeVal.PAT; // Free the type handle
;}
break;
case 156:
-#line 2477 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2479 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if ((yyvsp[(1) - (2)].TypeVal).PAT->get() != (yyvsp[(2) - (2)].ConstVal).C->getType())
+ if (yyvsp[-1].TypeVal.PAT->get() != yyvsp[0].ConstVal.C->getType())
error("Mismatched types for constant expression");
- (yyval.ConstVal) = (yyvsp[(2) - (2)].ConstVal);
- (yyval.ConstVal).S.copy((yyvsp[(1) - (2)].TypeVal).S);
- delete (yyvsp[(1) - (2)].TypeVal).PAT;
+ yyval.ConstVal = yyvsp[0].ConstVal;
+ yyval.ConstVal.S.copy(yyvsp[-1].TypeVal.S);
+ delete yyvsp[-1].TypeVal.PAT;
;}
break;
case 157:
-#line 2484 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2486 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const Type *Ty = (yyvsp[(1) - (2)].TypeVal).PAT->get();
+ const Type *Ty = yyvsp[-1].TypeVal.PAT->get();
if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
error("Cannot create a null initialized value of this type");
- (yyval.ConstVal).C = Constant::getNullValue(Ty);
- (yyval.ConstVal).S.copy((yyvsp[(1) - (2)].TypeVal).S);
- delete (yyvsp[(1) - (2)].TypeVal).PAT;
+ yyval.ConstVal.C = Constant::getNullValue(Ty);
+ yyval.ConstVal.S.copy(yyvsp[-1].TypeVal.S);
+ delete yyvsp[-1].TypeVal.PAT;
;}
break;
case 158:
-#line 2492 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2494 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // integral constants
- const Type *Ty = (yyvsp[(1) - (2)].PrimType).T;
- if (!ConstantInt::isValueValidForType(Ty, (yyvsp[(2) - (2)].SInt64Val)))
+ const Type *Ty = yyvsp[-1].PrimType.T;
+ if (!ConstantInt::isValueValidForType(Ty, yyvsp[0].SInt64Val))
error("Constant value doesn't fit in type");
- (yyval.ConstVal).C = ConstantInt::get(Ty, (yyvsp[(2) - (2)].SInt64Val));
- (yyval.ConstVal).S.makeSigned();
+ yyval.ConstVal.C = ConstantInt::get(Ty, yyvsp[0].SInt64Val);
+ yyval.ConstVal.S.makeSigned();
;}
break;
case 159:
-#line 2499 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2501 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // integral constants
- const Type *Ty = (yyvsp[(1) - (2)].PrimType).T;
- if (!ConstantInt::isValueValidForType(Ty, (yyvsp[(2) - (2)].UInt64Val)))
+ const Type *Ty = yyvsp[-1].PrimType.T;
+ if (!ConstantInt::isValueValidForType(Ty, yyvsp[0].UInt64Val))
error("Constant value doesn't fit in type");
- (yyval.ConstVal).C = ConstantInt::get(Ty, (yyvsp[(2) - (2)].UInt64Val));
- (yyval.ConstVal).S.makeUnsigned();
+ yyval.ConstVal.C = ConstantInt::get(Ty, yyvsp[0].UInt64Val);
+ yyval.ConstVal.S.makeUnsigned();
;}
break;
case 160:
-#line 2506 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2508 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Boolean constants
- (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, true);
- (yyval.ConstVal).S.makeUnsigned();
+ yyval.ConstVal.C = ConstantInt::get(Type::Int1Ty, true);
+ yyval.ConstVal.S.makeUnsigned();
;}
break;
case 161:
-#line 2510 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2512 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Boolean constants
- (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, false);
- (yyval.ConstVal).S.makeUnsigned();
+ yyval.ConstVal.C = ConstantInt::get(Type::Int1Ty, false);
+ yyval.ConstVal.S.makeUnsigned();
;}
break;
case 162:
-#line 2514 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2516 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Float & Double constants
- if (!ConstantFP::isValueValidForType((yyvsp[(1) - (2)].PrimType).T, (yyvsp[(2) - (2)].FPVal)))
+ if (!ConstantFP::isValueValidForType(yyvsp[-1].PrimType.T, yyvsp[0].FPVal))
error("Floating point constant invalid for type");
- (yyval.ConstVal).C = ConstantFP::get((yyvsp[(1) - (2)].PrimType).T, (yyvsp[(2) - (2)].FPVal));
- (yyval.ConstVal).S.makeSignless();
+ yyval.ConstVal.C = ConstantFP::get(yyvsp[-1].PrimType.T, yyvsp[0].FPVal);
+ yyval.ConstVal.S.makeSignless();
;}
break;
case 163:
-#line 2523 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2525 "/users/dag/projects/cascade/llvm.modified/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);
+ 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 (!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<Constant>(getCast((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal).C, SrcSign, DstTy, DstSign));
- (yyval.ConstVal).S.copy(DstSign);
- delete (yyvsp[(5) - (6)].TypeVal).PAT;
+ yyval.ConstVal.C = cast<Constant>(getCast(yyvsp[-5].CastOpVal, yyvsp[-3].ConstVal.C, SrcSign, DstTy, DstSign));
+ yyval.ConstVal.S.copy(DstSign);
+ delete yyvsp[-1].TypeVal.PAT;
;}
break;
case 164:
-#line 2538 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2540 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const Type *Ty = (yyvsp[(3) - (5)].ConstVal).C->getType();
+ const Type *Ty = yyvsp[-2].ConstVal.C->getType();
if (!isa<PointerType>(Ty))
error("GetElementPtr requires a pointer operand");
std::vector<Constant*> CIndices;
- upgradeGEPCEIndices((yyvsp[(3) - (5)].ConstVal).C->getType(), (yyvsp[(4) - (5)].ValueList), CIndices);
+ upgradeGEPCEIndices(yyvsp[-2].ConstVal.C->getType(), yyvsp[-1].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));
+ 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 165:
-#line 2550 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2552 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[(3) - (8)].ConstVal).C->getType()->isInteger() ||
- cast<IntegerType>((yyvsp[(3) - (8)].ConstVal).C->getType())->getBitWidth() != 1)
+ if (!yyvsp[-5].ConstVal.C->getType()->isInteger() ||
+ cast<IntegerType>(yyvsp[-5].ConstVal.C->getType())->getBitWidth() != 1)
error("Select condition must be bool type");
- if ((yyvsp[(5) - (8)].ConstVal).C->getType() != (yyvsp[(7) - (8)].ConstVal).C->getType())
+ if (yyvsp[-3].ConstVal.C->getType() != yyvsp[-1].ConstVal.C->getType())
error("Select operand types must match");
- (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);
+ 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 166:
-#line 2559 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2561 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const Type *Ty = (yyvsp[(3) - (6)].ConstVal).C->getType();
- if (Ty != (yyvsp[(5) - (6)].ConstVal).C->getType())
+ const Type *Ty = yyvsp[-3].ConstVal.C->getType();
+ if (Ty != yyvsp[-1].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[(1) - (6)].BinaryOpVal), Ty, (yyvsp[(3) - (6)].ConstVal).S);
+ Instruction::BinaryOps Opcode = getBinaryOp(yyvsp[-5].BinaryOpVal, Ty, yyvsp[-3].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<PointerType>(Ty)) {
- (yyval.ConstVal).C = ConstantExpr::get(Opcode, (yyvsp[(3) - (6)].ConstVal).C, (yyvsp[(5) - (6)].ConstVal).C);
+ yyval.ConstVal.C = ConstantExpr::get(Opcode, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C);
} else {
const Type *IntPtrTy = 0;
switch (CurModule.CurrentModule->getPointerSize()) {
@@ -5145,165 +4807,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) - (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.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).S.copy((yyvsp[(3) - (6)].ConstVal).S);
+ yyval.ConstVal.S.copy(yyvsp[-3].ConstVal.S);
;}
break;
case 167:
-#line 2587 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2589 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const Type* Ty = (yyvsp[(3) - (6)].ConstVal).C->getType();
- if (Ty != (yyvsp[(5) - (6)].ConstVal).C->getType())
+ const Type* Ty = yyvsp[-3].ConstVal.C->getType();
+ if (Ty != yyvsp[-1].ConstVal.C->getType())
error("Logical operator types must match");
if (!Ty->isInteger()) {
if (!isa<VectorType>(Ty) ||
!cast<VectorType>(Ty)->getElementType()->isInteger())
error("Logical operator requires integer operands");
}
- 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);
+ 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 168:
-#line 2600 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2602 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const Type* Ty = (yyvsp[(3) - (6)].ConstVal).C->getType();
- if (Ty != (yyvsp[(5) - (6)].ConstVal).C->getType())
+ const Type* Ty = yyvsp[-3].ConstVal.C->getType();
+ if (Ty != yyvsp[-1].ConstVal.C->getType())
error("setcc operand types must match");
unsigned short pred;
- 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();
+ 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 169:
-#line 2609 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2611 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if ((yyvsp[(4) - (7)].ConstVal).C->getType() != (yyvsp[(6) - (7)].ConstVal).C->getType())
+ if (yyvsp[-3].ConstVal.C->getType() != yyvsp[-1].ConstVal.C->getType())
error("icmp operand types must match");
- (yyval.ConstVal).C = ConstantExpr::getCompare((yyvsp[(2) - (7)].IPred), (yyvsp[(4) - (7)].ConstVal).C, (yyvsp[(6) - (7)].ConstVal).C);
- (yyval.ConstVal).S.makeUnsigned();
+ yyval.ConstVal.C = ConstantExpr::getCompare(yyvsp[-5].IPred, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C);
+ yyval.ConstVal.S.makeUnsigned();
;}
break;
case 170:
-#line 2615 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2617 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if ((yyvsp[(4) - (7)].ConstVal).C->getType() != (yyvsp[(6) - (7)].ConstVal).C->getType())
+ if (yyvsp[-3].ConstVal.C->getType() != yyvsp[-1].ConstVal.C->getType())
error("fcmp operand types must match");
- (yyval.ConstVal).C = ConstantExpr::getCompare((yyvsp[(2) - (7)].FPred), (yyvsp[(4) - (7)].ConstVal).C, (yyvsp[(6) - (7)].ConstVal).C);
- (yyval.ConstVal).S.makeUnsigned();
+ yyval.ConstVal.C = ConstantExpr::getCompare(yyvsp[-5].FPred, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C);
+ yyval.ConstVal.S.makeUnsigned();
;}
break;
case 171:
-#line 2621 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2623 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[(5) - (6)].ConstVal).C->getType()->isInteger() ||
- cast<IntegerType>((yyvsp[(5) - (6)].ConstVal).C->getType())->getBitWidth() != 8)
+ if (!yyvsp[-1].ConstVal.C->getType()->isInteger() ||
+ cast<IntegerType>(yyvsp[-1].ConstVal.C->getType())->getBitWidth() != 8)
error("Shift count for shift constant must be unsigned byte");
- const Type* Ty = (yyvsp[(3) - (6)].ConstVal).C->getType();
- if (!(yyvsp[(3) - (6)].ConstVal).C->getType()->isInteger())
+ const Type* Ty = yyvsp[-3].ConstVal.C->getType();
+ if (!yyvsp[-3].ConstVal.C->getType()->isInteger())
error("Shift constant expression requires integer operand");
- 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);
+ 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 172:
-#line 2632 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2634 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal).C, (yyvsp[(5) - (6)].ConstVal).C))
+ if (!ExtractElementInst::isValidOperands(yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C))
error("Invalid extractelement operands");
- (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));
+ 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 173:
-#line 2638 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2640 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!InsertElementInst::isValidOperands((yyvsp[(3) - (8)].ConstVal).C, (yyvsp[(5) - (8)].ConstVal).C, (yyvsp[(7) - (8)].ConstVal).C))
+ if (!InsertElementInst::isValidOperands(yyvsp[-5].ConstVal.C, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C))
error("Invalid insertelement operands");
- (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);
+ 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 174:
-#line 2644 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2646 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!ShuffleVectorInst::isValidOperands((yyvsp[(3) - (8)].ConstVal).C, (yyvsp[(5) - (8)].ConstVal).C, (yyvsp[(7) - (8)].ConstVal).C))
+ if (!ShuffleVectorInst::isValidOperands(yyvsp[-5].ConstVal.C, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C))
error("Invalid shufflevector operands");
- (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);
+ 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 175:
-#line 2655 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal)); ;}
+#line 2657 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ConstVector = yyvsp[-2].ConstVector)->push_back(yyvsp[0].ConstVal); ;}
break;
case 176:
-#line 2656 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2658 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.ConstVector) = new std::vector<ConstInfo>();
- (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal));
+ yyval.ConstVector = new std::vector<ConstInfo>();
+ yyval.ConstVector->push_back(yyvsp[0].ConstVal);
;}
break;
case 177:
-#line 2665 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.BoolVal) = false; ;}
+#line 2667 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.BoolVal = false; ;}
break;
case 178:
-#line 2666 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.BoolVal) = true; ;}
+#line 2668 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.BoolVal = true; ;}
break;
case 179:
-#line 2678 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2680 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.ModuleVal) = ParserResult = (yyvsp[(1) - (1)].ModuleVal);
+ yyval.ModuleVal = ParserResult = yyvsp[0].ModuleVal;
CurModule.ModuleDone();
;}
break;
case 180:
-#line 2687 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ModuleVal) = (yyvsp[(1) - (2)].ModuleVal); CurFun.FunctionDone(); ;}
+#line 2689 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.ModuleVal = yyvsp[-1].ModuleVal; CurFun.FunctionDone(); ;}
break;
case 181:
-#line 2688 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ModuleVal) = (yyvsp[(1) - (2)].ModuleVal); ;}
+#line 2690 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.ModuleVal = yyvsp[-1].ModuleVal; ;}
break;
case 182:
-#line 2689 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ModuleVal) = (yyvsp[(1) - (4)].ModuleVal); ;}
+#line 2691 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.ModuleVal = yyvsp[-3].ModuleVal; ;}
break;
case 183:
-#line 2690 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ModuleVal) = (yyvsp[(1) - (2)].ModuleVal); ;}
+#line 2692 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.ModuleVal = yyvsp[-1].ModuleVal; ;}
break;
case 184:
-#line 2691 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2693 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.ModuleVal) = CurModule.CurrentModule;
+ 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;
@@ -5317,7 +4979,7 @@
break;
case 185:
-#line 2707 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2709 "/users/dag/projects/cascade/llvm.modified/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:
@@ -5328,123 +4990,123 @@
// If types are not resolved eagerly, then the two types will not be
// determined to be the same type!
//
- ResolveTypeTo((yyvsp[(2) - (4)].StrVal), (yyvsp[(4) - (4)].TypeVal).PAT->get(), (yyvsp[(4) - (4)].TypeVal).S);
+ ResolveTypeTo(yyvsp[-2].StrVal, yyvsp[0].TypeVal.PAT->get(), yyvsp[0].TypeVal.S);
- if (!setTypeName((yyvsp[(4) - (4)].TypeVal), (yyvsp[(2) - (4)].StrVal)) && !(yyvsp[(2) - (4)].StrVal)) {
+ if (!setTypeName(yyvsp[0].TypeVal, yyvsp[-2].StrVal) && !yyvsp[-2].StrVal) {
// If this is a numbered type that is not a redefinition, add it to the
// slot table.
- CurModule.Types.push_back((yyvsp[(4) - (4)].TypeVal).PAT->get());
- CurModule.TypeSigns.push_back((yyvsp[(4) - (4)].TypeVal).S);
+ CurModule.Types.push_back(yyvsp[0].TypeVal.PAT->get());
+ CurModule.TypeSigns.push_back(yyvsp[0].TypeVal.S);
}
- delete (yyvsp[(4) - (4)].TypeVal).PAT;
+ delete yyvsp[0].TypeVal.PAT;
;}
break;
case 186:
-#line 2727 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2729 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Function prototypes can be in const pool
;}
break;
case 187:
-#line 2729 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2731 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Asm blocks can be in the const pool
;}
break;
case 188:
-#line 2731 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2733 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if ((yyvsp[(5) - (5)].ConstVal).C == 0)
+ if (yyvsp[0].ConstVal.C == 0)
error("Global value initializer is not a constant");
- 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);
+ 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 189:
-#line 2735 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2737 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
CurGV = 0;
;}
break;
case 190:
-#line 2738 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2740 "/users/dag/projects/cascade/llvm.modified/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;
+ 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 191:
-#line 2743 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2745 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
CurGV = 0;
;}
break;
case 192:
-#line 2746 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2748 "/users/dag/projects/cascade/llvm.modified/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;
+ 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 193:
-#line 2751 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2753 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
CurGV = 0;
;}
break;
case 194:
-#line 2754 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2756 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const Type *Ty = (yyvsp[(5) - (5)].TypeVal).PAT->get();
+ const Type *Ty = yyvsp[0].TypeVal.PAT->get();
CurGV =
- ParseGlobalVariable((yyvsp[(2) - (5)].StrVal), GlobalValue::ExternalWeakLinkage, (yyvsp[(4) - (5)].BoolVal), Ty, 0,
- (yyvsp[(5) - (5)].TypeVal).S);
- delete (yyvsp[(5) - (5)].TypeVal).PAT;
+ ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::ExternalWeakLinkage, yyvsp[-1].BoolVal, Ty, 0,
+ yyvsp[0].TypeVal.S);
+ delete yyvsp[0].TypeVal.PAT;
;}
break;
case 195:
-#line 2760 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2762 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
CurGV = 0;
;}
break;
case 196:
-#line 2763 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2765 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
;}
break;
case 197:
-#line 2765 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2767 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
;}
break;
case 198:
-#line 2767 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2769 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
;}
break;
case 199:
-#line 2772 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2774 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
- char *EndStr = UnEscapeLexed((yyvsp[(1) - (1)].StrVal), true);
- std::string NewAsm((yyvsp[(1) - (1)].StrVal), EndStr);
- free((yyvsp[(1) - (1)].StrVal));
+ char *EndStr = UnEscapeLexed(yyvsp[0].StrVal, true);
+ std::string NewAsm(yyvsp[0].StrVal, EndStr);
+ free(yyvsp[0].StrVal);
if (AsmSoFar.empty())
CurModule.CurrentModule->setModuleInlineAsm(NewAsm);
@@ -5454,149 +5116,149 @@
break;
case 200:
-#line 2786 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.Endianness) = Module::BigEndian; ;}
+#line 2788 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.Endianness = Module::BigEndian; ;}
break;
case 201:
-#line 2787 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.Endianness) = Module::LittleEndian; ;}
+#line 2789 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.Endianness = Module::LittleEndian; ;}
break;
case 202:
-#line 2791 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2793 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- CurModule.setEndianness((yyvsp[(3) - (3)].Endianness));
+ CurModule.setEndianness(yyvsp[0].Endianness);
;}
break;
case 203:
-#line 2794 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2796 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if ((yyvsp[(3) - (3)].UInt64Val) == 32)
+ if (yyvsp[0].UInt64Val == 32)
CurModule.setPointerSize(Module::Pointer32);
- else if ((yyvsp[(3) - (3)].UInt64Val) == 64)
+ else if (yyvsp[0].UInt64Val == 64)
CurModule.setPointerSize(Module::Pointer64);
else
- error("Invalid pointer size: '" + utostr((yyvsp[(3) - (3)].UInt64Val)) + "'");
+ error("Invalid pointer size: '" + utostr(yyvsp[0].UInt64Val) + "'");
;}
break;
case 204:
-#line 2802 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2804 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- CurModule.CurrentModule->setTargetTriple((yyvsp[(3) - (3)].StrVal));
- free((yyvsp[(3) - (3)].StrVal));
+ CurModule.CurrentModule->setTargetTriple(yyvsp[0].StrVal);
+ free(yyvsp[0].StrVal);
;}
break;
case 205:
-#line 2806 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2808 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- CurModule.CurrentModule->setDataLayout((yyvsp[(3) - (3)].StrVal));
- free((yyvsp[(3) - (3)].StrVal));
+ CurModule.CurrentModule->setDataLayout(yyvsp[0].StrVal);
+ free(yyvsp[0].StrVal);
;}
break;
case 207:
-#line 2817 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2819 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- CurModule.CurrentModule->addLibrary((yyvsp[(3) - (3)].StrVal));
- free((yyvsp[(3) - (3)].StrVal));
+ CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal);
+ free(yyvsp[0].StrVal);
;}
break;
case 208:
-#line 2821 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2823 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- CurModule.CurrentModule->addLibrary((yyvsp[(1) - (1)].StrVal));
- free((yyvsp[(1) - (1)].StrVal));
+ CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal);
+ free(yyvsp[0].StrVal);
;}
break;
case 209:
-#line 2825 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2827 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ ;}
break;
case 213:
-#line 2838 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.StrVal) = 0; ;}
+#line 2840 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.StrVal = 0; ;}
break;
case 214:
-#line 2842 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2844 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if ((yyvsp[(1) - (2)].TypeVal).PAT->get() == Type::VoidTy)
+ if (yyvsp[-1].TypeVal.PAT->get() == Type::VoidTy)
error("void typed arguments are invalid");
- (yyval.ArgVal) = new std::pair<PATypeInfo, char*>((yyvsp[(1) - (2)].TypeVal), (yyvsp[(2) - (2)].StrVal));
+ yyval.ArgVal = new std::pair<PATypeInfo, char*>(yyvsp[-1].TypeVal, yyvsp[0].StrVal);
;}
break;
case 215:
-#line 2850 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2852 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList);
- (yyval.ArgList)->push_back(*(yyvsp[(3) - (3)].ArgVal));
- delete (yyvsp[(3) - (3)].ArgVal);
+ yyval.ArgList = yyvsp[-2].ArgList;
+ yyval.ArgList->push_back(*yyvsp[0].ArgVal);
+ delete yyvsp[0].ArgVal;
;}
break;
case 216:
-#line 2855 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2857 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.ArgList) = new std::vector<std::pair<PATypeInfo,char*> >();
- (yyval.ArgList)->push_back(*(yyvsp[(1) - (1)].ArgVal));
- delete (yyvsp[(1) - (1)].ArgVal);
+ yyval.ArgList = new std::vector<std::pair<PATypeInfo,char*> >();
+ yyval.ArgList->push_back(*yyvsp[0].ArgVal);
+ delete yyvsp[0].ArgVal;
;}
break;
case 217:
-#line 2863 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList); ;}
+#line 2865 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.ArgList = yyvsp[0].ArgList; ;}
break;
case 218:
-#line 2864 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2866 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList);
+ yyval.ArgList = yyvsp[-2].ArgList;
PATypeInfo VoidTI;
VoidTI.PAT = new PATypeHolder(Type::VoidTy);
VoidTI.S.makeSignless();
- (yyval.ArgList)->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
+ yyval.ArgList->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
;}
break;
case 219:
-#line 2871 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2873 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.ArgList) = new std::vector<std::pair<PATypeInfo,char*> >();
+ yyval.ArgList = new std::vector<std::pair<PATypeInfo,char*> >();
PATypeInfo VoidTI;
VoidTI.PAT = new PATypeHolder(Type::VoidTy);
VoidTI.S.makeSignless();
- (yyval.ArgList)->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
+ yyval.ArgList->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
;}
break;
case 220:
-#line 2878 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ArgList) = 0; ;}
+#line 2880 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.ArgList = 0; ;}
break;
case 221:
-#line 2882 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 2884 "/users/dag/projects/cascade/llvm.modified/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!
+ UnEscapeLexed(yyvsp[-5].StrVal);
+ std::string FunctionName(yyvsp[-5].StrVal);
+ free(yyvsp[-5].StrVal); // Free strdup'd memory!
- const Type* RetTy = (yyvsp[(2) - (8)].TypeVal).PAT->get();
+ const Type* RetTy = yyvsp[-6].TypeVal.PAT->get();
if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy)
error("LLVM functions cannot return aggregate types");
Signedness FTySign;
- FTySign.makeComposite((yyvsp[(2) - (8)].TypeVal).S);
+ FTySign.makeComposite(yyvsp[-6].TypeVal.S);
std::vector<const Type*> ParamTyList;
// In LLVM 2.0 the signatures of three varargs intrinsics changed to take
@@ -5607,9 +5269,9 @@
} else if (FunctionName == "llvm.va_copy") {
ParamTyList.push_back(PointerType::get(Type::Int8Ty));
ParamTyList.push_back(PointerType::get(Type::Int8Ty));
- } else if ((yyvsp[(5) - (8)].ArgList)) { // If there are arguments...
+ } else if (yyvsp[-3].ArgList) { // If there are arguments...
for (std::vector<std::pair<PATypeInfo,char*> >::iterator
- I = (yyvsp[(5) - (8)].ArgList)->begin(), E = (yyvsp[(5) - (8)].ArgList)->end(); I != E; ++I) {
+ I = yyvsp[-3].ArgList->begin(), E = yyvsp[-3].ArgList->end(); I != E; ++I) {
const Type *Ty = I->first.PAT->get();
ParamTyList.push_back(Ty);
FTySign.add(I->first.S);
@@ -5623,7 +5285,7 @@
// Convert the CSRet calling convention into the corresponding parameter
// attribute.
ParamAttrsList *PAL = 0;
- if ((yyvsp[(1) - (8)].UIntVal) == OldCallingConv::CSRet) {
+ if (yyvsp[-7].UIntVal == OldCallingConv::CSRet) {
ParamAttrsVector Attrs;
ParamAttrsWithIndex PAWI;
PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg
@@ -5634,7 +5296,7 @@
const FunctionType *FT =
FunctionType::get(RetTy, ParamTyList, isVarArg, PAL);
const PointerType *PFT = PointerType::get(FT);
- delete (yyvsp[(2) - (8)].TypeVal).PAT;
+ delete yyvsp[-6].TypeVal.PAT;
ValID ID;
if (!FunctionName.empty()) {
@@ -5743,163 +5405,163 @@
// argument to another function.
Fn->setLinkage(CurFun.Linkage);
}
- 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));
+ Fn->setCallingConv(upgradeCallingConv(yyvsp[-7].UIntVal));
+ Fn->setAlignment(yyvsp[0].UIntVal);
+ if (yyvsp[-1].StrVal) {
+ Fn->setSection(yyvsp[-1].StrVal);
+ free(yyvsp[-1].StrVal);
}
// Add all of the arguments we parsed to the function...
- if ((yyvsp[(5) - (8)].ArgList)) { // Is null if empty...
+ if (yyvsp[-3].ArgList) { // Is null if empty...
if (isVarArg) { // Nuke 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
+ 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
}
Function::arg_iterator ArgIt = Fn->arg_begin();
Function::arg_iterator ArgEnd = Fn->arg_end();
- std::vector<std::pair<PATypeInfo,char*> >::iterator I = (yyvsp[(5) - (8)].ArgList)->begin();
- std::vector<std::pair<PATypeInfo,char*> >::iterator E = (yyvsp[(5) - (8)].ArgList)->end();
+ std::vector<std::pair<PATypeInfo,char*> >::iterator I = yyvsp[-3].ArgList->begin();
+ std::vector<std::pair<PATypeInfo,char*> >::iterator E = yyvsp[-3].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[(5) - (8)].ArgList); // We're now done with the argument list
+ delete yyvsp[-3].ArgList; // We're now done with the argument list
}
lastCallingConv = OldCallingConv::C;
;}
break;
case 224:
-#line 3076 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { CurFun.Linkage = (yyvsp[(1) - (1)].Linkage); ;}
+#line 3078 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { CurFun.Linkage = yyvsp[0].Linkage; ;}
break;
case 225:
-#line 3076 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3078 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.FunctionVal) = CurFun.CurrentFunction;
+ 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[(1) - (4)].Linkage));
+ yyval.FunctionVal->setLinkage(yyvsp[-3].Linkage);
;}
break;
case 228:
-#line 3090 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3092 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
+ yyval.FunctionVal = yyvsp[-1].FunctionVal;
;}
break;
case 229:
-#line 3095 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
+#line 3097 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.Linkage = GlobalValue::ExternalLinkage; ;}
break;
case 230:
-#line 3096 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
+#line 3098 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.Linkage = GlobalValue::DLLImportLinkage; ;}
break;
case 231:
-#line 3097 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
+#line 3099 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.Linkage = GlobalValue::ExternalWeakLinkage; ;}
break;
case 232:
-#line 3101 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3103 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ CurFun.isDeclare = true; ;}
break;
case 233:
-#line 3102 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { CurFun.Linkage = (yyvsp[(3) - (3)].Linkage); ;}
+#line 3104 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { CurFun.Linkage = yyvsp[0].Linkage; ;}
break;
case 234:
-#line 3102 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3104 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.FunctionVal) = CurFun.CurrentFunction;
+ yyval.FunctionVal = CurFun.CurrentFunction;
CurFun.FunctionDone();
;}
break;
case 235:
-#line 3114 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.BoolVal) = false; ;}
+#line 3116 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.BoolVal = false; ;}
break;
case 236:
-#line 3115 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.BoolVal) = true; ;}
+#line 3117 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.BoolVal = true; ;}
break;
case 237:
-#line 3120 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val)); ;}
+#line 3122 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.ValIDVal = ValID::create(yyvsp[0].SInt64Val); ;}
break;
case 238:
-#line 3121 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val)); ;}
+#line 3123 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.ValIDVal = ValID::create(yyvsp[0].UInt64Val); ;}
break;
case 239:
-#line 3122 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal)); ;}
+#line 3124 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.ValIDVal = ValID::create(yyvsp[0].FPVal); ;}
break;
case 240:
-#line 3123 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3125 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, true));
- (yyval.ValIDVal).S.makeUnsigned();
+ yyval.ValIDVal = ValID::create(ConstantInt::get(Type::Int1Ty, true));
+ yyval.ValIDVal.S.makeUnsigned();
;}
break;
case 241:
-#line 3127 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3129 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, false));
- (yyval.ValIDVal).S.makeUnsigned();
+ yyval.ValIDVal = ValID::create(ConstantInt::get(Type::Int1Ty, false));
+ yyval.ValIDVal.S.makeUnsigned();
;}
break;
case 242:
-#line 3131 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValIDVal) = ValID::createNull(); ;}
+#line 3133 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.ValIDVal = ValID::createNull(); ;}
break;
case 243:
-#line 3132 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValIDVal) = ValID::createUndef(); ;}
+#line 3134 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.ValIDVal = ValID::createUndef(); ;}
break;
case 244:
-#line 3133 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValIDVal) = ValID::createZeroInit(); ;}
+#line 3135 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.ValIDVal = ValID::createZeroInit(); ;}
break;
case 245:
-#line 3134 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3136 "/users/dag/projects/cascade/llvm.modified/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();
+ const Type *ETy = (*yyvsp[-1].ConstVector)[0].C->getType();
+ int NumElements = yyvsp[-1].ConstVector->size();
VectorType* pt = VectorType::get(ETy, NumElements);
- (yyval.ValIDVal).S.makeComposite((*(yyvsp[(2) - (3)].ConstVector))[0].S);
- PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt, (yyval.ValIDVal).S));
+ yyval.ValIDVal.S.makeComposite((*yyvsp[-1].ConstVector)[0].S);
+ PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt, yyval.ValIDVal.S));
// Verify all elements are correct type!
std::vector<Constant*> Elems;
- for (unsigned i = 0; i < (yyvsp[(2) - (3)].ConstVector)->size(); i++) {
- Constant *C = (*(yyvsp[(2) - (3)].ConstVector))[i].C;
+ for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) {
+ Constant *C = (*yyvsp[-1].ConstVector)[i].C;
const Type *CTy = C->getType();
if (ETy != CTy)
error("Element #" + utostr(i) + " is not of type '" +
@@ -5907,209 +5569,209 @@
CTy->getDescription() + "'");
Elems.push_back(C);
}
- (yyval.ValIDVal) = ValID::create(ConstantVector::get(pt, Elems));
- delete PTy; delete (yyvsp[(2) - (3)].ConstVector);
+ yyval.ValIDVal = ValID::create(ConstantVector::get(pt, Elems));
+ delete PTy; delete yyvsp[-1].ConstVector;
;}
break;
case 246:
-#line 3155 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3157 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal).C);
- (yyval.ValIDVal).S.copy((yyvsp[(1) - (1)].ConstVal).S);
+ yyval.ValIDVal = ValID::create(yyvsp[0].ConstVal.C);
+ yyval.ValIDVal.S.copy(yyvsp[0].ConstVal.S);
;}
break;
case 247:
-#line 3159 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3161 "/users/dag/projects/cascade/llvm.modified/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));
+ 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 248:
-#line 3173 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SIntVal)); (yyval.ValIDVal).S.makeSignless(); ;}
+#line 3175 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.ValIDVal = ValID::create(yyvsp[0].SIntVal); yyval.ValIDVal.S.makeSignless(); ;}
break;
case 249:
-#line 3174 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].StrVal)); (yyval.ValIDVal).S.makeSignless(); ;}
+#line 3176 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.ValIDVal = ValID::create(yyvsp[0].StrVal); yyval.ValIDVal.S.makeSignless(); ;}
break;
case 252:
-#line 3187 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3189 "/users/dag/projects/cascade/llvm.modified/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;
+ 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 253:
-#line 3197 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3199 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
+ yyval.FunctionVal = yyvsp[-1].FunctionVal;
;}
break;
case 254:
-#line 3200 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3202 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Do not allow functions with 0 basic blocks
- (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
+ yyval.FunctionVal = yyvsp[-1].FunctionVal;
;}
break;
case 255:
-#line 3209 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3211 "/users/dag/projects/cascade/llvm.modified/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);
+ 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 256:
-#line 3220 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3222 "/users/dag/projects/cascade/llvm.modified/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);
+ if (yyvsp[0].InstVal.I)
+ yyvsp[-1].BasicBlockVal->getInstList().push_back(yyvsp[0].InstVal.I);
+ yyval.BasicBlockVal = yyvsp[-1].BasicBlockVal;
;}
break;
case 257:
-#line 3225 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3227 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++),true);
+ 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));
+ BBL.splice(BBL.end(), BBL, yyval.BasicBlockVal);
;}
break;
case 258:
-#line 3234 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3236 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((yyvsp[(1) - (1)].StrVal)), true);
+ yyval.BasicBlockVal = CurBB = getBBVal(ValID::create(yyvsp[0].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));
+ BBL.splice(BBL.end(), BBL, yyval.BasicBlockVal);
;}
break;
case 261:
-#line 3248 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3250 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Return with a result...
- (yyval.TermInstVal).TI = new ReturnInst((yyvsp[(2) - (2)].ValueVal).V);
- (yyval.TermInstVal).S.makeSignless();
+ yyval.TermInstVal.TI = new ReturnInst(yyvsp[0].ValueVal.V);
+ yyval.TermInstVal.S.makeSignless();
;}
break;
case 262:
-#line 3252 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3254 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Return with no result...
- (yyval.TermInstVal).TI = new ReturnInst();
- (yyval.TermInstVal).S.makeSignless();
+ yyval.TermInstVal.TI = new ReturnInst();
+ yyval.TermInstVal.S.makeSignless();
;}
break;
case 263:
-#line 3256 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3258 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Unconditional Branch...
- BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal));
- (yyval.TermInstVal).TI = new BranchInst(tmpBB);
- (yyval.TermInstVal).S.makeSignless();
+ BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
+ yyval.TermInstVal.TI = new BranchInst(tmpBB);
+ yyval.TermInstVal.S.makeSignless();
;}
break;
case 264:
-#line 3261 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3263 "/users/dag/projects/cascade/llvm.modified/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();
+ 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 265:
-#line 3271 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3273 "/users/dag/projects/cascade/llvm.modified/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<std::pair<Constant*,BasicBlock*> >::iterator I = (yyvsp[(8) - (9)].JumpTable)->begin(),
- E = (yyvsp[(8) - (9)].JumpTable)->end();
+ 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<std::pair<Constant*,BasicBlock*> >::iterator I = yyvsp[-1].JumpTable->begin(),
+ E = yyvsp[-1].JumpTable->end();
for (; I != E; ++I) {
if (ConstantInt *CI = dyn_cast<ConstantInt>(I->first))
S->addCase(CI, I->second);
else
error("Switch case is constant, but not a simple integer");
}
- delete (yyvsp[(8) - (9)].JumpTable);
+ delete yyvsp[-1].JumpTable;
;}
break;
case 266:
-#line 3289 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3291 "/users/dag/projects/cascade/llvm.modified/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));
+ 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);
SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0);
- (yyval.TermInstVal).TI = S;
- (yyval.TermInstVal).S.makeSignless();
+ yyval.TermInstVal.TI = S;
+ yyval.TermInstVal.S.makeSignless();
;}
break;
case 267:
-#line 3299 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3301 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
const PointerType *PFTy;
const FunctionType *Ty;
Signedness FTySign;
- if (!(PFTy = dyn_cast<PointerType>((yyvsp[(3) - (13)].TypeVal).PAT->get())) ||
+ if (!(PFTy = dyn_cast<PointerType>(yyvsp[-10].TypeVal.PAT->get())) ||
!(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
// Pull out the types of all of the arguments...
std::vector<const Type*> ParamTypes;
- FTySign.makeComposite((yyvsp[(3) - (13)].TypeVal).S);
- if ((yyvsp[(6) - (13)].ValueList)) {
- for (std::vector<ValueInfo>::iterator I = (yyvsp[(6) - (13)].ValueList)->begin(), E = (yyvsp[(6) - (13)].ValueList)->end();
+ FTySign.makeComposite(yyvsp[-10].TypeVal.S);
+ if (yyvsp[-7].ValueList) {
+ for (std::vector<ValueInfo>::iterator I = yyvsp[-7].ValueList->begin(), E = yyvsp[-7].ValueList->end();
I != E; ++I) {
ParamTypes.push_back((*I).V->getType());
FTySign.add(I->S);
}
}
ParamAttrsList *PAL = 0;
- if ((yyvsp[(2) - (13)].UIntVal) == OldCallingConv::CSRet) {
+ if (yyvsp[-11].UIntVal == OldCallingConv::CSRet) {
ParamAttrsVector Attrs;
ParamAttrsWithIndex PAWI;
PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg
@@ -6118,32 +5780,33 @@
}
bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy;
if (isVarArg) ParamTypes.pop_back();
- Ty = FunctionType::get((yyvsp[(3) - (13)].TypeVal).PAT->get(), ParamTypes, isVarArg, PAL);
+ Ty = FunctionType::get(yyvsp[-10].TypeVal.PAT->get(), ParamTypes, isVarArg, PAL);
PFTy = PointerType::get(Ty);
- (yyval.TermInstVal).S.copy((yyvsp[(3) - (13)].TypeVal).S);
+ yyval.TermInstVal.S.copy(yyvsp[-10].TypeVal.S);
} else {
- FTySign = (yyvsp[(3) - (13)].TypeVal).S;
+ FTySign = yyvsp[-10].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[(3) - (13)].TypeVal).S.get(0).get(0));
+ yyval.TermInstVal.S.copy(yyvsp[-10].TypeVal.S.get(0).get(0));
}
- (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));
+ 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);
// Create the call node...
- if (!(yyvsp[(6) - (13)].ValueList)) { // Has no arguments?
- (yyval.TermInstVal).TI = new InvokeInst(V, Normal, Except, 0, 0);
+ if (!yyvsp[-7].ValueList) { // Has no arguments?
+ std::vector<Value*> Args;
+ 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<ValueInfo>::iterator ArgI = (yyvsp[(6) - (13)].ValueList)->begin(), ArgE = (yyvsp[(6) - (13)].ValueList)->end();
+ std::vector<ValueInfo>::iterator ArgI = yyvsp[-7].ValueList->begin(), ArgE = yyvsp[-7].ValueList->end();
std::vector<Value*> Args;
for (; ArgI != ArgE && I != E; ++ArgI, ++I) {
@@ -6156,71 +5819,71 @@
if (I != E || (ArgI != ArgE && !Ty->isVarArg()))
error("Invalid number of parameters detected");
- (yyval.TermInstVal).TI = new InvokeInst(V, Normal, Except, &Args[0], Args.size());
+ yyval.TermInstVal.TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end());
}
- cast<InvokeInst>((yyval.TermInstVal).TI)->setCallingConv(upgradeCallingConv((yyvsp[(2) - (13)].UIntVal)));
- delete (yyvsp[(3) - (13)].TypeVal).PAT;
- delete (yyvsp[(6) - (13)].ValueList);
+ cast<InvokeInst>(yyval.TermInstVal.TI)->setCallingConv(upgradeCallingConv(yyvsp[-11].UIntVal));
+ delete yyvsp[-10].TypeVal.PAT;
+ delete yyvsp[-7].ValueList;
lastCallingConv = OldCallingConv::C;
;}
break;
case 268:
-#line 3371 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3374 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.TermInstVal).TI = new UnwindInst();
- (yyval.TermInstVal).S.makeSignless();
+ yyval.TermInstVal.TI = new UnwindInst();
+ yyval.TermInstVal.S.makeSignless();
;}
break;
case 269:
-#line 3375 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3378 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.TermInstVal).TI = new UnreachableInst();
- (yyval.TermInstVal).S.makeSignless();
+ yyval.TermInstVal.TI = new UnreachableInst();
+ yyval.TermInstVal.S.makeSignless();
;}
break;
case 270:
-#line 3382 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3385 "/users/dag/projects/cascade/llvm.modified/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<Constant>(getExistingValue((yyvsp[(2) - (6)].PrimType).T, (yyvsp[(3) - (6)].ValIDVal)));
+ yyval.JumpTable = yyvsp[-5].JumpTable;
+ yyvsp[-3].ValIDVal.S.copy(yyvsp[-4].PrimType.S);
+ Constant *V = cast<Constant>(getExistingValue(yyvsp[-4].PrimType.T, yyvsp[-3].ValIDVal));
if (V == 0)
error("May only switch on a constant pool value");
- (yyvsp[(6) - (6)].ValIDVal).S.makeSignless();
- BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (6)].ValIDVal));
- (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
+ yyvsp[0].ValIDVal.S.makeSignless();
+ BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
+ yyval.JumpTable->push_back(std::make_pair(V, tmpBB));
;}
break;
case 271:
-#line 3394 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3397 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
- (yyvsp[(2) - (5)].ValIDVal).S.copy((yyvsp[(1) - (5)].PrimType).S);
- Constant *V = cast<Constant>(getExistingValue((yyvsp[(1) - (5)].PrimType).T, (yyvsp[(2) - (5)].ValIDVal)));
+ yyval.JumpTable = new std::vector<std::pair<Constant*, BasicBlock*> >();
+ yyvsp[-3].ValIDVal.S.copy(yyvsp[-4].PrimType.S);
+ Constant *V = cast<Constant>(getExistingValue(yyvsp[-4].PrimType.T, yyvsp[-3].ValIDVal));
if (V == 0)
error("May only switch on a constant pool value");
- (yyvsp[(5) - (5)].ValIDVal).S.makeSignless();
- BasicBlock* tmpBB = getBBVal((yyvsp[(5) - (5)].ValIDVal));
- (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
+ yyvsp[0].ValIDVal.S.makeSignless();
+ BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
+ yyval.JumpTable->push_back(std::make_pair(V, tmpBB));
;}
break;
case 272:
-#line 3409 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3412 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
bool omit = false;
- if ((yyvsp[(1) - (2)].StrVal))
- if (BitCastInst *BCI = dyn_cast<BitCastInst>((yyvsp[(2) - (2)].InstVal).I))
+ if (yyvsp[-1].StrVal)
+ if (BitCastInst *BCI = dyn_cast<BitCastInst>(yyvsp[0].InstVal.I))
if (BCI->getSrcTy() == BCI->getDestTy() &&
- BCI->getOperand(0)->getName() == (yyvsp[(1) - (2)].StrVal))
+ BCI->getOperand(0)->getName() == yyvsp[-1].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
@@ -6235,258 +5898,258 @@
// 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[(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);
+ 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;
}
;}
break;
case 273:
-#line 3439 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3442 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Used for PHI nodes
- (yyval.PHIList).P = new std::list<std::pair<Value*, BasicBlock*> >();
- (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;
+ yyval.PHIList.P = new std::list<std::pair<Value*, BasicBlock*> >();
+ 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 274:
-#line 3449 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3452 "/users/dag/projects/cascade/llvm.modified/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));
+ 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 275:
-#line 3459 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3462 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{ // Used for call statements, and memory insts...
- (yyval.ValueList) = new std::vector<ValueInfo>();
- (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal));
+ yyval.ValueList = new std::vector<ValueInfo>();
+ yyval.ValueList->push_back(yyvsp[0].ValueVal);
;}
break;
case 276:
-#line 3463 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3466 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList);
- (yyvsp[(1) - (3)].ValueList)->push_back((yyvsp[(3) - (3)].ValueVal));
+ yyval.ValueList = yyvsp[-2].ValueList;
+ yyvsp[-2].ValueList->push_back(yyvsp[0].ValueVal);
;}
break;
case 278:
-#line 3471 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValueList) = 0; ;}
+#line 3474 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.ValueList = 0; ;}
break;
case 279:
-#line 3475 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3478 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.BoolVal) = true;
+ yyval.BoolVal = true;
;}
break;
case 280:
-#line 3478 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3481 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.BoolVal) = false;
+ yyval.BoolVal = false;
;}
break;
case 281:
-#line 3484 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3487 "/users/dag/projects/cascade/llvm.modified/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();
+ 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();
if (!Ty->isInteger() && !Ty->isFloatingPoint() && !isa<VectorType>(Ty))
error("Arithmetic operator requires integer, FP, or packed operands");
if (isa<VectorType>(Ty) &&
- ((yyvsp[(1) - (5)].BinaryOpVal) == URemOp || (yyvsp[(1) - (5)].BinaryOpVal) == SRemOp || (yyvsp[(1) - (5)].BinaryOpVal) == FRemOp || (yyvsp[(1) - (5)].BinaryOpVal) == RemOp))
+ (yyvsp[-4].BinaryOpVal == URemOp || yyvsp[-4].BinaryOpVal == SRemOp || yyvsp[-4].BinaryOpVal == FRemOp || yyvsp[-4].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[(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)
+ 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)
error("binary operator returned null");
- (yyval.InstVal).S.copy((yyvsp[(2) - (5)].TypeVal).S);
- delete (yyvsp[(2) - (5)].TypeVal).PAT;
+ yyval.InstVal.S.copy(yyvsp[-3].TypeVal.S);
+ delete yyvsp[-3].TypeVal.PAT;
;}
break;
case 282:
-#line 3503 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3506 "/users/dag/projects/cascade/llvm.modified/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();
+ 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();
if (!Ty->isInteger()) {
if (!isa<VectorType>(Ty) ||
!cast<VectorType>(Ty)->getElementType()->isInteger())
error("Logical operator requires integral operands");
}
- 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)
+ 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)
error("binary operator returned null");
- (yyval.InstVal).S.copy((yyvsp[(2) - (5)].TypeVal).S);
- delete (yyvsp[(2) - (5)].TypeVal).PAT;
+ yyval.InstVal.S.copy(yyvsp[-3].TypeVal.S);
+ delete yyvsp[-3].TypeVal.PAT;
;}
break;
case 283:
-#line 3521 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3524 "/users/dag/projects/cascade/llvm.modified/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();
+ 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();
if(isa<VectorType>(Ty))
error("VectorTypes currently not supported in setcc instructions");
unsigned short pred;
- 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)
+ 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)
error("binary operator returned null");
- (yyval.InstVal).S.makeUnsigned();
- delete (yyvsp[(2) - (5)].TypeVal).PAT;
+ yyval.InstVal.S.makeUnsigned();
+ delete yyvsp[-3].TypeVal.PAT;
;}
break;
case 284:
-#line 3537 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3540 "/users/dag/projects/cascade/llvm.modified/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();
+ 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();
if (isa<VectorType>(Ty))
error("VectorTypes currently not supported in icmp instructions");
else if (!Ty->isInteger() && !isa<PointerType>(Ty))
error("icmp requires integer or pointer typed operands");
- 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;
+ 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 285:
-#line 3551 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3554 "/users/dag/projects/cascade/llvm.modified/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();
+ 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();
if (isa<VectorType>(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[(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;
+ 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 286:
-#line 3565 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3568 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
warning("Use of obsolete 'not' instruction: Replacing with 'xor");
- const Type *Ty = (yyvsp[(2) - (2)].ValueVal).V->getType();
+ const Type *Ty = yyvsp[0].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[(2) - (2)].ValueVal).V, Ones);
- if ((yyval.InstVal).I == 0)
+ yyval.InstVal.I = BinaryOperator::create(Instruction::Xor, yyvsp[0].ValueVal.V, Ones);
+ if (yyval.InstVal.I == 0)
error("Could not create a xor instruction");
- (yyval.InstVal).S.copy((yyvsp[(2) - (2)].ValueVal).S);
+ yyval.InstVal.S.copy(yyvsp[0].ValueVal.S);
;}
break;
case 287:
-#line 3576 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3579 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[(4) - (4)].ValueVal).V->getType()->isInteger() ||
- cast<IntegerType>((yyvsp[(4) - (4)].ValueVal).V->getType())->getBitWidth() != 8)
+ if (!yyvsp[0].ValueVal.V->getType()->isInteger() ||
+ cast<IntegerType>(yyvsp[0].ValueVal.V->getType())->getBitWidth() != 8)
error("Shift amount must be int8");
- const Type* Ty = (yyvsp[(2) - (4)].ValueVal).V->getType();
+ const Type* Ty = yyvsp[-2].ValueVal.V->getType();
if (!Ty->isInteger())
error("Shift constant expression requires integer operand");
Value* ShiftAmt = 0;
if (cast<IntegerType>(Ty)->getBitWidth() > Type::Int8Ty->getBitWidth())
- if (Constant *C = dyn_cast<Constant>((yyvsp[(4) - (4)].ValueVal).V))
+ if (Constant *C = dyn_cast<Constant>(yyvsp[0].ValueVal.V))
ShiftAmt = ConstantExpr::getZExt(C, Ty);
else
- ShiftAmt = new ZExtInst((yyvsp[(4) - (4)].ValueVal).V, Ty, makeNameUnique("shift"), CurBB);
+ ShiftAmt = new ZExtInst(yyvsp[0].ValueVal.V, Ty, makeNameUnique("shift"), CurBB);
else
- 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);
+ 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 288:
-#line 3594 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3597 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const Type *DstTy = (yyvsp[(4) - (4)].TypeVal).PAT->get();
+ const Type *DstTy = yyvsp[0].TypeVal.PAT->get();
if (!DstTy->isFirstClassType())
error("cast instruction to a non-primitive type: '" +
DstTy->getDescription() + "'");
- (yyval.InstVal).I = cast<Instruction>(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;
+ yyval.InstVal.I = cast<Instruction>(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 289:
-#line 3603 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3606 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[(2) - (6)].ValueVal).V->getType()->isInteger() ||
- cast<IntegerType>((yyvsp[(2) - (6)].ValueVal).V->getType())->getBitWidth() != 1)
+ if (!yyvsp[-4].ValueVal.V->getType()->isInteger() ||
+ cast<IntegerType>(yyvsp[-4].ValueVal.V->getType())->getBitWidth() != 1)
error("select condition must be bool");
- if ((yyvsp[(4) - (6)].ValueVal).V->getType() != (yyvsp[(6) - (6)].ValueVal).V->getType())
+ if (yyvsp[-2].ValueVal.V->getType() != yyvsp[0].ValueVal.V->getType())
error("select value types should match");
- (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);
+ 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 290:
-#line 3612 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3615 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const Type *Ty = (yyvsp[(4) - (4)].TypeVal).PAT->get();
+ const Type *Ty = yyvsp[0].TypeVal.PAT->get();
NewVarArgs = true;
- (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;
+ 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 291:
-#line 3619 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3622 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const Type* ArgTy = (yyvsp[(2) - (4)].ValueVal).V->getType();
- const Type* DstTy = (yyvsp[(4) - (4)].TypeVal).PAT->get();
+ const Type* ArgTy = yyvsp[-2].ValueVal.V->getType();
+ const Type* DstTy = yyvsp[0].TypeVal.PAT->get();
ObsoleteVarArgs = true;
Function* NF = cast<Function>(CurModule.CurrentModule->
getOrInsertFunction("llvm.va_copy", ArgTy, ArgTy, (Type *)0));
@@ -6498,20 +6161,20 @@
//b = vaarg foo, t
AllocaInst* foo = new AllocaInst(ArgTy, 0, "vaarg.fix");
CurBB->getInstList().push_back(foo);
- CallInst* bar = new CallInst(NF, (yyvsp[(2) - (4)].ValueVal).V);
+ CallInst* bar = new CallInst(NF, yyvsp[-2].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[(4) - (4)].TypeVal).S);
- delete (yyvsp[(4) - (4)].TypeVal).PAT;
+ yyval.InstVal.I = new VAArgInst(foo, DstTy);
+ yyval.InstVal.S.copy(yyvsp[0].TypeVal.S);
+ delete yyvsp[0].TypeVal.PAT;
;}
break;
case 292:
-#line 3640 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3643 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const Type* ArgTy = (yyvsp[(2) - (4)].ValueVal).V->getType();
- const Type* DstTy = (yyvsp[(4) - (4)].TypeVal).PAT->get();
+ const Type* ArgTy = yyvsp[-2].ValueVal.V->getType();
+ const Type* DstTy = yyvsp[0].TypeVal.PAT->get();
ObsoleteVarArgs = true;
Function* NF = cast<Function>(CurModule.CurrentModule->
getOrInsertFunction("llvm.va_copy", ArgTy, ArgTy, (Type *)0));
@@ -6524,81 +6187,81 @@
//b = load foo
AllocaInst* foo = new AllocaInst(ArgTy, 0, "vanext.fix");
CurBB->getInstList().push_back(foo);
- CallInst* bar = new CallInst(NF, (yyvsp[(2) - (4)].ValueVal).V);
+ CallInst* bar = new CallInst(NF, yyvsp[-2].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[(4) - (4)].TypeVal).S);
- delete (yyvsp[(4) - (4)].TypeVal).PAT;
+ yyval.InstVal.I = new LoadInst(foo);
+ yyval.InstVal.S.copy(yyvsp[0].TypeVal.S);
+ delete yyvsp[0].TypeVal.PAT;
;}
break;
case 293:
-#line 3664 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3667 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal).V, (yyvsp[(4) - (4)].ValueVal).V))
+ if (!ExtractElementInst::isValidOperands(yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V))
error("Invalid extractelement operands");
- (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));
+ 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 294:
-#line 3670 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3673 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!InsertElementInst::isValidOperands((yyvsp[(2) - (6)].ValueVal).V, (yyvsp[(4) - (6)].ValueVal).V, (yyvsp[(6) - (6)].ValueVal).V))
+ if (!InsertElementInst::isValidOperands(yyvsp[-4].ValueVal.V, yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V))
error("Invalid insertelement operands");
- (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);
+ 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 295:
-#line 3676 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3679 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!ShuffleVectorInst::isValidOperands((yyvsp[(2) - (6)].ValueVal).V, (yyvsp[(4) - (6)].ValueVal).V, (yyvsp[(6) - (6)].ValueVal).V))
+ if (!ShuffleVectorInst::isValidOperands(yyvsp[-4].ValueVal.V, yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V))
error("Invalid shufflevector operands");
- (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);
+ 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 296:
-#line 3682 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3685 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const Type *Ty = (yyvsp[(2) - (2)].PHIList).P->front().first->getType();
+ const Type *Ty = yyvsp[0].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[(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)
+ 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)
error("All elements of a PHI node must be of the same type");
- PHI->addIncoming((yyvsp[(2) - (2)].PHIList).P->front().first, (yyvsp[(2) - (2)].PHIList).P->front().second);
- (yyvsp[(2) - (2)].PHIList).P->pop_front();
+ PHI->addIncoming(yyvsp[0].PHIList.P->front().first, yyvsp[0].PHIList.P->front().second);
+ yyvsp[0].PHIList.P->pop_front();
}
- (yyval.InstVal).I = PHI;
- (yyval.InstVal).S.copy((yyvsp[(2) - (2)].PHIList).S);
- delete (yyvsp[(2) - (2)].PHIList).P; // Free the list...
+ yyval.InstVal.I = PHI;
+ yyval.InstVal.S.copy(yyvsp[0].PHIList.S);
+ delete yyvsp[0].PHIList.P; // Free the list...
;}
break;
case 297:
-#line 3698 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3701 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
// Handle the short call syntax
const PointerType *PFTy;
const FunctionType *FTy;
Signedness FTySign;
- if (!(PFTy = dyn_cast<PointerType>((yyvsp[(3) - (7)].TypeVal).PAT->get())) ||
+ if (!(PFTy = dyn_cast<PointerType>(yyvsp[-4].TypeVal.PAT->get())) ||
!(FTy = dyn_cast<FunctionType>(PFTy->getElementType()))) {
// Pull out the types of all of the arguments...
std::vector<const Type*> ParamTypes;
- FTySign.makeComposite((yyvsp[(3) - (7)].TypeVal).S);
- if ((yyvsp[(6) - (7)].ValueList)) {
- for (std::vector<ValueInfo>::iterator I = (yyvsp[(6) - (7)].ValueList)->begin(), E = (yyvsp[(6) - (7)].ValueList)->end();
+ FTySign.makeComposite(yyvsp[-4].TypeVal.S);
+ if (yyvsp[-1].ValueList) {
+ for (std::vector<ValueInfo>::iterator I = yyvsp[-1].ValueList->begin(), E = yyvsp[-1].ValueList->end();
I != E; ++I) {
ParamTypes.push_back((*I).V->getType());
FTySign.add(I->S);
@@ -6608,13 +6271,13 @@
bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy;
if (isVarArg) ParamTypes.pop_back();
- const Type *RetTy = (yyvsp[(3) - (7)].TypeVal).PAT->get();
+ const Type *RetTy = yyvsp[-4].TypeVal.PAT->get();
if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy)
error("Functions cannot return aggregate types");
// Deal with CSRetCC
ParamAttrsList *PAL = 0;
- if ((yyvsp[(2) - (7)].UIntVal) == OldCallingConv::CSRet) {
+ if (yyvsp[-5].UIntVal == OldCallingConv::CSRet) {
ParamAttrsVector Attrs;
ParamAttrsWithIndex PAWI;
PAWI.index = 1; PAWI.attrs = ParamAttr::StructRet; // first arg
@@ -6624,32 +6287,32 @@
FTy = FunctionType::get(RetTy, ParamTypes, isVarArg, PAL);
PFTy = PointerType::get(FTy);
- (yyval.InstVal).S.copy((yyvsp[(3) - (7)].TypeVal).S);
+ yyval.InstVal.S.copy(yyvsp[-4].TypeVal.S);
} else {
- FTySign = (yyvsp[(3) - (7)].TypeVal).S;
+ FTySign = yyvsp[-4].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[(3) - (7)].TypeVal).S.get(0).get(0));
+ yyval.InstVal.S.copy(yyvsp[-4].TypeVal.S.get(0).get(0));
}
- (yyvsp[(4) - (7)].ValIDVal).S.makeComposite(FTySign);
+ yyvsp[-3].ValIDVal.S.makeComposite(FTySign);
// First upgrade any intrinsic calls.
std::vector<Value*> 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 (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 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[(4) - (7)].ValIDVal));
+ Value *V = getVal(PFTy, yyvsp[-3].ValIDVal);
// Check the argument values match
- if (!(yyvsp[(6) - (7)].ValueList)) { // Has no arguments?
+ if (!yyvsp[-1].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");
@@ -6659,7 +6322,7 @@
//
FunctionType::param_iterator I = FTy->param_begin();
FunctionType::param_iterator E = FTy->param_end();
- std::vector<ValueInfo>::iterator ArgI = (yyvsp[(6) - (7)].ValueList)->begin(), ArgE = (yyvsp[(6) - (7)].ValueList)->end();
+ std::vector<ValueInfo>::iterator ArgI = yyvsp[-1].ValueList->begin(), ArgE = yyvsp[-1].ValueList->end();
for (; ArgI != ArgE && I != E; ++ArgI, ++I)
if ((*ArgI).V->getType() != *I)
@@ -6672,128 +6335,128 @@
// Create the call instruction
CallInst *CI = new CallInst(V, Args.begin(), Args.end());
- CI->setTailCall((yyvsp[(1) - (7)].BoolVal));
- CI->setCallingConv(upgradeCallingConv((yyvsp[(2) - (7)].UIntVal)));
- (yyval.InstVal).I = CI;
+ CI->setTailCall(yyvsp[-6].BoolVal);
+ CI->setCallingConv(upgradeCallingConv(yyvsp[-5].UIntVal));
+ yyval.InstVal.I = CI;
}
- delete (yyvsp[(3) - (7)].TypeVal).PAT;
- delete (yyvsp[(6) - (7)].ValueList);
+ delete yyvsp[-4].TypeVal.PAT;
+ delete yyvsp[-1].ValueList;
lastCallingConv = OldCallingConv::C;
;}
break;
case 298:
-#line 3791 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3794 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal);
+ yyval.InstVal = yyvsp[0].InstVal;
;}
break;
case 299:
-#line 3799 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValueList) = (yyvsp[(2) - (2)].ValueList); ;}
+#line 3802 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.ValueList = yyvsp[0].ValueList; ;}
break;
case 300:
-#line 3800 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValueList) = new std::vector<ValueInfo>(); ;}
+#line 3803 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.ValueList = new std::vector<ValueInfo>(); ;}
break;
case 301:
-#line 3804 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.BoolVal) = true; ;}
+#line 3807 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.BoolVal = true; ;}
break;
case 302:
-#line 3805 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.BoolVal) = false; ;}
+#line 3808 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
+ { yyval.BoolVal = false; ;}
break;
case 303:
-#line 3809 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3812 "/users/dag/projects/cascade/llvm.modified/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;
+ 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 304:
-#line 3815 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3818 "/users/dag/projects/cascade/llvm.modified/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;
+ 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 305:
-#line 3822 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3825 "/users/dag/projects/cascade/llvm.modified/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;
+ 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 306:
-#line 3828 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3831 "/users/dag/projects/cascade/llvm.modified/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;
+ 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 307:
-#line 3835 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3838 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- const Type *PTy = (yyvsp[(2) - (2)].ValueVal).V->getType();
+ const Type *PTy = yyvsp[0].ValueVal.V->getType();
if (!isa<PointerType>(PTy))
error("Trying to free nonpointer type '" + PTy->getDescription() + "'");
- (yyval.InstVal).I = new FreeInst((yyvsp[(2) - (2)].ValueVal).V);
- (yyval.InstVal).S.makeSignless();
+ yyval.InstVal.I = new FreeInst(yyvsp[0].ValueVal.V);
+ yyval.InstVal.S.makeSignless();
;}
break;
case 308:
-#line 3842 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3845 "/users/dag/projects/cascade/llvm.modified/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);
+ const Type* Ty = yyvsp[-1].TypeVal.PAT->get();
+ yyvsp[0].ValIDVal.S.copy(yyvsp[-1].TypeVal.S);
if (!isa<PointerType>(Ty))
error("Can't load from nonpointer type: " + Ty->getDescription());
if (!cast<PointerType>(Ty)->getElementType()->isFirstClassType())
error("Can't load from pointer of non-first-class type: " +
Ty->getDescription());
- 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;
+ 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 309:
-#line 3855 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3858 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyvsp[(6) - (6)].ValIDVal).S.copy((yyvsp[(5) - (6)].TypeVal).S);
- const PointerType *PTy = dyn_cast<PointerType>((yyvsp[(5) - (6)].TypeVal).PAT->get());
+ yyvsp[0].ValIDVal.S.copy(yyvsp[-1].TypeVal.S);
+ const PointerType *PTy = dyn_cast<PointerType>(yyvsp[-1].TypeVal.PAT->get());
if (!PTy)
error("Can't store to a nonpointer type: " +
- (yyvsp[(5) - (6)].TypeVal).PAT->get()->getDescription());
+ yyvsp[-1].TypeVal.PAT->get()->getDescription());
const Type *ElTy = PTy->getElementType();
- Value *StoreVal = (yyvsp[(3) - (6)].ValueVal).V;
- Value* tmpVal = getVal(PTy, (yyvsp[(6) - (6)].ValIDVal));
- if (ElTy != (yyvsp[(3) - (6)].ValueVal).V->getType()) {
- StoreVal = handleSRetFuncTypeMerge((yyvsp[(3) - (6)].ValueVal).V, ElTy);
+ 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) - (6)].ValueVal).V->getType()->getDescription() +
+ error("Can't store '" + yyvsp[-3].ValueVal.V->getType()->getDescription() +
"' into space of type '" + ElTy->getDescription() + "'");
else {
PTy = PointerType::get(StoreVal->getType());
@@ -6803,41 +6466,42 @@
tmpVal = new BitCastInst(tmpVal, PTy, "upgrd.cast", CurBB);
}
}
- (yyval.InstVal).I = new StoreInst(StoreVal, tmpVal, (yyvsp[(1) - (6)].BoolVal));
- (yyval.InstVal).S.makeSignless();
- delete (yyvsp[(5) - (6)].TypeVal).PAT;
+ yyval.InstVal.I = new StoreInst(StoreVal, tmpVal, yyvsp[-5].BoolVal);
+ yyval.InstVal.S.makeSignless();
+ delete yyvsp[-1].TypeVal.PAT;
;}
break;
case 310:
-#line 3881 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3884 "/users/dag/projects/cascade/llvm.modified/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();
+ yyvsp[-1].ValIDVal.S.copy(yyvsp[-2].TypeVal.S);
+ const Type* Ty = yyvsp[-2].TypeVal.PAT->get();
if (!isa<PointerType>(Ty))
error("getelementptr insn requires pointer operand");
std::vector<Value*> VIndices;
- upgradeGEPInstIndices(Ty, (yyvsp[(4) - (4)].ValueList), VIndices);
+ upgradeGEPInstIndices(Ty, yyvsp[0].ValueList, VIndices);
- Value* tmpVal = getVal(Ty, (yyvsp[(3) - (4)].ValIDVal));
- (yyval.InstVal).I = new GetElementPtrInst(tmpVal, &VIndices[0], VIndices.size());
- 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);
+ 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;
-/* Line 1267 of yacc.c. */
-#line 6835 "UpgradeParser.tab.c"
- default: break;
}
- YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
- YYPOPSTACK (yylen);
- yylen = 0;
+/* Line 993 of yacc.c. */
+#line 6500 "UpgradeParser.tab.c"
+
+ yyvsp -= yylen;
+ yyssp -= yylen;
+
+
YY_STACK_PRINT (yyss, yyssp);
*++yyvsp = yyval;
@@ -6866,65 +6530,99 @@
if (!yyerrstatus)
{
++yynerrs;
-#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 YYERROR_VERBOSE
+ yyn = yypact[yystate];
- 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
+ if (YYPACT_NINF < yyn && yyn < YYLAST)
+ {
+ YYSIZE_T yysize = 0;
+ int yytype = YYTRANSLATE (yychar);
+ const char* yyprefix;
+ char *yymsg;
+ int yyx;
+
+ /* 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;
+ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+ int yycount = 0;
+
+ yyprefix = ", expecting ";
+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+ {
+ yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
+ yycount += 1;
+ if (yycount == 5)
+ {
+ yysize = 0;
+ break;
+ }
+ }
+ yysize += (sizeof ("syntax error, unexpected ")
+ + yystrlen (yytname[yytype]));
+ yymsg = (char *) YYSTACK_ALLOC (yysize);
+ if (yymsg != 0)
+ {
+ char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
+ yyp = yystpcpy (yyp, yytname[yytype]);
+
+ if (yycount < 5)
+ {
+ yyprefix = ", expecting ";
+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+ {
+ yyp = yystpcpy (yyp, yyprefix);
+ yyp = yystpcpy (yyp, yytname[yyx]);
+ yyprefix = " or ";
+ }
+ }
+ yyerror (yymsg);
+ YYSTACK_FREE (yymsg);
+ }
+ else
+ yyerror ("syntax error; also virtual memory exhausted");
+ }
+ else
+#endif /* YYERROR_VERBOSE */
+ yyerror ("syntax error");
}
if (yyerrstatus == 3)
{
- /* If just tried and failed to reuse look-ahead token after an
+ /* If just tried and failed to reuse lookahead token after an
error, discard it. */
if (yychar <= YYEOF)
- {
- /* Return failure if at end of input. */
+ {
+ /* If at end of input, pop the error token,
+ then the rest of the stack, then return failure. */
if (yychar == YYEOF)
- YYABORT;
- }
+ for (;;)
+ {
+ YYPOPSTACK;
+ if (yyssp == yyss)
+ YYABORT;
+ YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+ yydestruct (yystos[*yyssp], yyvsp);
+ }
+ }
else
{
- yydestruct ("Error: discarding",
- yytoken, &yylval);
+ YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+ yydestruct (yytoken, &yylval);
yychar = YYEMPTY;
+
}
}
- /* Else will try to reuse look-ahead token after shifting the error
+ /* Else will try to reuse lookahead token after shifting the error
token. */
goto yyerrlab1;
@@ -6934,17 +6632,15 @@
`---------------------------------------------------*/
yyerrorlab:
- /* Pacify compilers like GCC when the user code never invokes
- YYERROR and the label yyerrorlab therefore never appears in user
- code. */
- if (/*CONSTCOND*/ 0)
+#ifdef __GNUC__
+ /* Pacify GCC when the user code never invokes YYERROR and the label
+ yyerrorlab therefore never appears in user code. */
+ if (0)
goto yyerrorlab;
+#endif
- /* Do not reclaim the symbols of the rule which action triggered
- this YYERROR. */
- YYPOPSTACK (yylen);
- yylen = 0;
- YY_STACK_PRINT (yyss, yyssp);
+ yyvsp -= yylen;
+ yyssp -= yylen;
yystate = *yyssp;
goto yyerrlab1;
@@ -6973,10 +6669,9 @@
if (yyssp == yyss)
YYABORT;
-
- yydestruct ("Error: popping",
- yystos[yystate], yyvsp);
- YYPOPSTACK (1);
+ YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+ yydestruct (yystos[yystate], yyvsp);
+ YYPOPSTACK;
yystate = *yyssp;
YY_STACK_PRINT (yyss, yyssp);
}
@@ -6984,12 +6679,11 @@
if (yyn == YYFINAL)
YYACCEPT;
+ YYDPRINTF ((stderr, "Shifting error token, "));
+
*++yyvsp = yylval;
- /* Shift the error token. */
- YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
-
yystate = yyn;
goto yynewstate;
@@ -7009,43 +6703,25 @@
goto yyreturn;
#ifndef yyoverflow
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here. |
-`-------------------------------------------------*/
-yyexhaustedlab:
- yyerror (YY_("memory exhausted"));
+/*----------------------------------------------.
+| yyoverflowlab -- parser overflow comes here. |
+`----------------------------------------------*/
+yyoverflowlab:
+ yyerror ("parser stack overflow");
yyresult = 2;
/* Fall through. */
#endif
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)
- {
- yydestruct ("Cleanup: popping",
- yystos[*yyssp], yyvsp);
- YYPOPSTACK (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);
+ return yyresult;
}
-#line 3899 "/home/chandlerc/code/compilers/llvm/tools/llvm-upgrade/UpgradeParser.y"
+#line 3902 "/users/dag/projects/cascade/llvm.modified/tools/llvm-upgrade/UpgradeParser.y"
int yyerror(const char *ErrorMsg) {