[llvm-commits] [llvm] r50175 - in /llvm/trunk/lib/AsmParser: llvmAsmParser.cpp.cvs llvmAsmParser.h.cvs llvmAsmParser.y llvmAsmParser.y.cvs

Dan Gohman gohman at apple.com
Wed Apr 23 13:11:27 PDT 2008


Author: djg
Date: Wed Apr 23 15:11:27 2008
New Revision: 50175

URL: http://llvm.org/viewvc/llvm-project?rev=50175&view=rev
Log:
Allow llvm-as to parse a getresult with an undef operand.

Modified:
    llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs
    llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs
    llvm/trunk/lib/AsmParser/llvmAsmParser.y
    llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs?rev=50175&r1=50174&r2=50175&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs Wed Apr 23 15:11:27 2008
@@ -380,7 +380,7 @@
 
 
 /* Copy the first part of user declarations.  */
-#line 14 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1337,7 +1337,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 950 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 950 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -1821,7 +1821,7 @@
      200,   155,    11,   235,   194,    -1,   113,   200,   194,    -1,
      113,   200,   155,    11,   235,   194,    -1,   114,   236,    -1,
      249,   115,   200,   235,   194,    -1,   249,   116,   236,   155,
-     200,   235,   194,    -1,   136,   200,   234,   155,     4,    -1,
+     200,   235,   194,    -1,   136,   200,   235,   155,     4,    -1,
      117,   200,   235,   246,    -1
 };
 
@@ -2104,87 +2104,87 @@
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -524
+#define YYPACT_NINF -536
 static const yytype_int16 yypact[] =
 {
-     369,  -524,  -524,  -524,  -524,  -524,  -524,  -524,    46,  -130,
-      11,   -89,    62,   -59,   258,  -524,   135,   506,  -524,   227,
-     130,   -12,    26,  -524,    -1,   180,  -524,  1572,  -524,  -524,
-    -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,
-     119,   119,   250,  -524,  -524,  -524,  -524,   119,  -524,  -524,
-    -524,  -524,  -524,   119,    39,  -524,    -2,   214,   221,   229,
-    -524,  -524,  -524,  -524,  -524,    59,  -524,  -524,  -524,  -524,
-    -524,  -524,  -524,  -524,   262,   268,     8,    35,  -524,  -524,
-    -524,     9,  -524,   195,   195,   244,  -524,   162,   233,   233,
-     186,   238,  -524,   127,  -524,  -524,  -524,  -524,  -524,  -524,
-    -524,    50,  1126,  -524,   133,   161,   815,    59,  -524,     9,
-     -88,   172,  1126,   181,   162,   162,  -524,  -524,  1372,  -524,
-    -524,  1612,   337,  -524,  -524,  -524,  -524,  -524,  1652,  -524,
-      -3,   314,   906,  1867,  -524,   334,  -524,  -524,     9,  -524,
-     205,   208,  1692,  1692,   200,   -64,  1692,  -524,   359,   211,
-    -524,  1612,  1692,    59,   216,     9,   410,  -524,   223,   357,
-     361,   362,   363,   365,   275,   366,  1182,   329,  -524,    97,
-    -524,  -524,  -524,   906,  -524,  -524,  -524,  -524,  -524,  -524,
-    -524,  -524,   324,  -524,  -524,  -524,  -524,  -524,  -524,  -524,
-    -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,   511,   491,
-     234,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,
-    -524,  -524,  -524,   252,   253,   259,   260,  1612,   263,   267,
-     271,  -524,  -524,  -524,  -524,  -524,  -524,   354,  1732,    68,
-     374,   233,  -524,  -524,   511,   491,  1692,  1692,  1692,  1692,
+     369,  -536,  -536,  -536,  -536,  -536,  -536,  -536,    39,  -128,
+     -20,   -82,    67,    -9,   258,  -536,   177,   506,  -536,   239,
+     226,    57,    78,  -536,    22,   214,  -536,  1572,  -536,  -536,
+    -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,
+     -35,   -35,   244,  -536,  -536,  -536,  -536,   -35,  -536,  -536,
+    -536,  -536,  -536,   -35,    15,  -536,    -2,   221,   232,   235,
+    -536,  -536,  -536,  -536,  -536,    99,  -536,  -536,  -536,  -536,
+    -536,  -536,  -536,  -536,   262,   268,     8,    35,  -536,  -536,
+    -536,   -26,  -536,   225,   225,   265,  -536,   128,   233,   233,
+     208,   254,  -536,   256,  -536,  -536,  -536,  -536,  -536,  -536,
+    -536,   -22,  1126,  -536,   161,   165,   815,    99,  -536,   -26,
+     -91,   174,  1126,   171,   128,   128,  -536,  -536,  1372,  -536,
+    -536,  1612,   324,  -536,  -536,  -536,  -536,  -536,  1652,  -536,
+      -6,   293,   906,  1867,  -536,   313,  -536,  -536,   -26,  -536,
+     181,   184,  1692,  1692,   179,   -84,  1692,  -536,   338,   190,
+    -536,  1612,  1692,    99,   192,   -26,   410,  -536,   223,   336,
+     343,   347,   351,   352,   204,   353,  1182,   309,  -536,   126,
+    -536,  -536,  -536,   906,  -536,  -536,  -536,  -536,  -536,  -536,
+    -536,  -536,   304,  -536,  -536,  -536,  -536,  -536,  -536,  -536,
+    -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,   511,   491,
+     216,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,
+    -536,  -536,  -536,   218,   219,   220,   222,  1612,   231,   234,
+     238,  -536,  -536,  -536,  -536,  -536,  -536,   310,  1732,    50,
+     364,   233,  -536,  -536,   511,   491,  1692,  1692,  1692,  1692,
     1692,  1692,  1692,  1692,  1692,  1692,  1692,  1692,  1692,  1692,
-    -524,   233,  -524,   197,  -524,  -524,   210,  1452,  -524,   -31,
-       2,  -524,   264,     9,   237,  -524,   329,   -25,  1372,  -524,
-    -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,
-    1412,  1772,   855,   403,  -524,  -524,  -524,   279,  -524,  -524,
-     405,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,
-    -524,   284,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,
-    -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,   285,  1612,
-    1612,  1612,  1612,  1612,  -524,   -46,  1612,  1612,  1612,  -524,
-      59,   766,  -524,   287,   906,   906,  -524,   906,  1652,  1692,
-    1692,    45,    51,  -524,   766,    17,   290,   294,   295,   297,
-     298,   299,    14,   766,   766,   417,  1652,  1692,  1692,   452,
-    -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,
-    -524,  -524,   189,  -524,  -524,  -524,  -524,   189,  -524,   181,
-     421,  -524,   102,  1080,   -32,  -524,   -49,  -524,   305,  1492,
-     306,  1612,  1612,  -524,   308,   311,   315,   316,  1612,  -524,
-     317,   318,   431,  -524,  1692,   319,  -524,   321,   906,   766,
-     766,    24,  -524,    28,  -524,  -524,   906,   320,  1692,  1692,
-    1692,  1692,  1692,   322,   325,   327,  1692,   906,   766,   328,
-    -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,   305,   305,
-    1692,  -524,   323,  1035,   -17,  -524,  -524,    30,  -524,  -524,
-       9,   331,   326,   462,   332,   333,   154,  1612,  1612,  1612,
-    1612,  -524,  1612,  1612,  1692,  -524,   472,   473,   340,   339,
-     341,   906,   493,   906,   347,   348,   906,   349,     9,  -524,
-     352,   353,   507,   906,   906,     9,   343,   360,  1692,  -524,
-    -524,    38,  -524,   371,   494,   515,  -524,   305,   115,  1532,
-    -524,  -524,  1612,  1612,  -524,  1692,   367,   368,   372,   379,
-     382,   385,    56,   906,   906,  1812,   906,   906,   360,  -524,
-     360,   906,   384,  1692,  1692,  1692,  -524,  -524,  -524,  1812,
-     487,  -524,   766,  -524,  -524,  -524,  -524,  -524,  -524,  -524,
-    -524,     9,    -6,   388,   389,  -524,  1612,  -524,  1612,  1612,
-    -524,  -524,  -524,   390,   386,    33,     9,   166,  -524,  -524,
-    -524,  -524,   383,   906,  -524,  -524,  -524,   170,   360,   115,
-    -524,   495,  -524,  -524,   396,   397,   399,   536,     3,   623,
-     623,  -524,  1852,  -524,   395,  -524,  -524,  -524,   552,   411,
-    -524,  -524,  -524,   906,  -524,  1323,     7,   412,   414,  -524,
-    -524,     6,    33,     9,  -524,   189,  -524,   540,  -524,  -524,
-     413,  -524,  1323,   210,   210,   550,   623,   623,  -524,   553,
-     416,   906,  -524,  -524,   906,   555,   500,   210,   210,  -524,
-     906,   557,  -524,   906,  -524
+    -536,   233,  -536,    79,  -536,  -536,   210,  1452,  -536,   -25,
+     -31,  -536,   242,   -26,   252,  -536,   309,     2,  1372,  -536,
+    -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,
+    1412,  1772,   855,   362,  -536,  -536,  -536,   259,  -536,  -536,
+     363,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,
+    -536,   260,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,
+    -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,   263,  1612,
+    1612,  1612,  1612,  1612,  -536,   -42,  1612,  1612,  1612,  -536,
+      99,   766,  -536,   255,   906,   906,  -536,   906,  1652,  1692,
+    1692,    20,    45,  -536,   766,   -29,   264,   270,   271,   272,
+     276,   281,   766,   766,   766,   385,  1652,  1692,  1692,   433,
+    -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,
+    -536,  -536,   -37,  -536,  -536,  -536,  -536,   -37,  -536,   171,
+     404,  -536,    -7,  1080,   -30,  -536,   -66,  -536,   290,  1492,
+     294,  1612,  1612,  -536,   295,   297,   298,   299,  1612,  -536,
+     300,   305,   421,  -536,  1692,   306,  -536,   308,   906,   766,
+     766,    10,  -536,    26,  -536,  -536,   906,   311,  1692,  1692,
+    1692,  1692,  1692,   315,   316,   317,  1692,   906,   766,   318,
+    -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,   290,   290,
+    1692,  -536,   312,  1035,   -47,  -536,  -536,    42,  -536,  -536,
+     -26,   321,   325,   444,   322,   327,   133,  1612,  1612,  1612,
+    1612,  -536,  1612,  1612,  1692,  -536,   462,   463,   331,   329,
+     330,   906,   482,   906,   332,   333,   906,   334,   -26,  -536,
+     335,   337,   490,   906,   906,   -26,   344,   340,  1692,  -536,
+    -536,    38,  -536,   341,   475,   498,  -536,   290,   115,  1532,
+    -536,  -536,  1612,  1612,  -536,  1692,   349,   354,   356,   360,
+     355,   366,    53,   906,   906,  1812,   906,   906,   340,  -536,
+     340,   906,   361,  1692,  1692,  1692,  -536,  -536,  -536,  1812,
+     468,  -536,   766,  -536,  -536,  -536,  -536,  -536,  -536,  -536,
+    -536,   -26,     5,   374,   380,  -536,  1612,  -536,  1612,  1612,
+    -536,  -536,  -536,   367,   376,    33,   -26,   166,  -536,  -536,
+    -536,  -536,   375,   906,  -536,  -536,  -536,   170,   340,   115,
+    -536,   485,  -536,  -536,   386,   387,   388,   525,     3,   623,
+     623,  -536,  1852,  -536,   383,  -536,  -536,  -536,   540,   397,
+    -536,  -536,  -536,   906,  -536,  1323,     7,   396,   398,  -536,
+    -536,    27,    33,   -26,  -536,   -37,  -536,   527,  -536,  -536,
+     400,  -536,  1323,   210,   210,   535,   623,   623,  -536,   536,
+     401,   906,  -536,  -536,   906,   542,   489,   210,   210,  -536,
+     906,   547,  -536,   906,  -536
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -524,   443,   445,   446,   350,   346,  -229,  -524,     0,    16,
-    -141,   489,    13,  -524,  -524,  -524,  -524,    61,  -524,  -524,
-    -524,  -190,  -524,  -444,  -524,  -263,  -524,  -524,  -337,    41,
-    -524,  -407,  -524,  -524,   -24,   356,  -108,  -524,   474,   508,
-     -81,  -150,  -207,   228,   261,   351,  -524,  -524,   598,  -524,
-    -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,
-     527,  -524,  -524,  -524,  -524,  -524,  -524,  -523,   -70,   104,
-    -234,  -524,  -524,   566,  -524,  -524,  -524,  -524,  -524,    94,
-     209,  -524,  -524,  -524,  -524
+    -536,   434,   435,   437,   339,   346,  -229,  -536,     0,    -3,
+    -126,   478,    13,  -536,  -536,  -536,  -536,    28,  -536,  -536,
+    -536,  -207,  -536,  -444,  -536,  -263,  -536,  -536,  -337,    30,
+    -536,  -407,  -536,  -536,   -24,   319,  -108,  -536,   466,   473,
+     -81,  -150,  -247,    88,   229,   314,  -536,  -536,   557,  -536,
+    -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,
+     494,  -536,  -536,  -536,  -536,  -536,  -536,  -535,   -70,   104,
+    -234,  -536,  -536,   528,  -536,  -536,  -536,  -536,  -536,    56,
+     198,  -536,  -536,  -536,  -536
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -2196,67 +2196,67 @@
 {
       11,   337,   377,    81,   343,   414,   498,   347,   348,   349,
      350,   351,   105,    13,   336,   355,   284,    11,   336,    90,
-     169,    63,    64,   111,    24,   170,   286,    94,   494,   111,
-      13,   489,   490,     1,     2,   471,     3,     4,     5,   473,
-     167,   338,    63,    64,   615,   107,    66,    67,    68,    69,
+     169,   471,   170,   111,   338,   111,    24,    94,   111,   111,
+      13,   489,   490,   382,   384,   386,    90,   473,    25,   494,
+     167,   286,    63,    64,   356,   107,    66,    67,    68,    69,
       70,    71,    72,   109,     1,     2,   111,     3,     4,     5,
-      90,   356,   223,   111,   494,    26,    91,   146,   111,    25,
-     266,   111,   610,   382,   384,   386,   147,   472,   138,   334,
-      27,   472,   109,   495,    73,   335,   269,  -144,   138,   620,
-     537,   146,   111,    11,   155,    28,   285,   569,    21,   111,
-     262,    83,    84,   223,   155,   111,   398,    91,    88,   398,
-     111,   579,   580,    22,    89,   446,   399,     2,   259,   260,
-       4,   112,   263,   398,   429,   378,   379,   112,   267,   373,
-     445,   431,   432,   433,     1,    43,   434,     3,   398,     5,
-     435,   436,    57,   431,   432,   433,     1,   493,   434,     3,
-     531,     5,   435,   436,   112,   613,   614,    59,   616,   617,
-     171,   112,    95,   594,   374,   -67,   112,   611,   359,   112,
-     465,   106,    49,    50,    51,   416,   444,    52,   627,   628,
-      58,   560,   287,   561,   477,  -144,   479,   480,   481,  -144,
-     112,   533,    74,    75,   119,   120,    76,   112,    77,   108,
-     411,   -67,    61,   112,   331,   135,   413,   -67,   112,   552,
-     136,   102,   341,   342,   331,   344,   345,   331,   331,   331,
+     610,   334,   223,   472,   146,   615,    91,   335,    83,    84,
+     266,   146,    26,   147,   111,    88,   494,   620,   138,   472,
+     262,    89,   109,    91,    73,    27,   269,  -144,   138,   398,
+     537,    21,   111,    11,   155,   495,   285,   569,   446,   111,
+     431,   432,   433,   223,   155,   434,    22,   111,   398,   435,
+     436,   579,   580,   398,    37,    38,    39,   493,   259,   260,
+     399,   112,   263,   112,   429,   398,   112,   112,   267,   416,
+     -67,   374,   445,   135,     1,   373,   444,     3,   136,     5,
+     378,   379,   431,   432,   433,    28,     2,   434,   398,     4,
+     531,   435,   436,   441,   112,   613,   614,   171,   616,   617,
+     119,   120,    95,   594,   431,   432,   433,   611,   359,   434,
+     465,   106,   112,   435,   436,   411,   -67,    43,   627,   628,
+      59,   560,   287,   561,   477,  -144,   479,   480,   481,  -144,
+     112,   533,    74,    75,   357,   358,    76,   112,    77,   108,
+     413,   -67,   151,   152,   331,   112,   552,   272,   273,   274,
+     275,    57,   341,   342,   331,   344,   345,   331,   331,   331,
      331,   331,   352,   353,   354,   331,   -55,   -55,   -55,   -55,
-     408,   586,    86,   138,   360,   361,    98,   542,   393,   394,
-     395,   396,   397,    99,   155,   400,   401,   402,   427,   270,
-     271,   100,   362,   363,   131,   364,   365,   398,   366,   367,
-     368,   223,   441,   359,   223,   223,   103,   223,    37,    38,
-      39,   545,   104,    45,   223,    46,   132,   288,   272,   273,
-     274,   275,   423,   223,   223,    85,   116,    86,   117,   564,
-     565,   566,   142,   284,   122,   123,   124,   125,   126,   127,
-      29,    30,    31,    32,    33,    34,    35,   504,    36,   505,
-     454,   455,   357,   358,   155,   409,   410,   461,   601,   581,
-     143,   582,   605,   585,   148,   582,   431,   432,   433,   360,
-     361,   434,   155,   428,   331,   435,   436,   150,   223,   223,
-     223,   168,   151,   152,   114,   115,   223,   362,   363,   595,
-     364,   365,   173,   366,   367,   368,   255,   223,   223,   443,
-     257,   258,   261,   264,   265,   450,   -56,   612,   268,  -208,
-     -57,   -60,   -59,   285,   -58,   276,   506,   507,   508,   509,
-     331,   510,   511,   111,   289,   336,   319,   -69,     1,     2,
-     376,     3,     4,     5,   331,   478,   331,   331,   331,     6,
-       7,   223,   485,   223,   320,   321,   223,    37,    38,    39,
-     329,   322,   323,   223,   223,   326,   491,    63,    64,   327,
-       8,   543,   544,   328,     9,   387,   375,   390,    10,     1,
-       2,   389,     3,     4,     5,   403,   391,   392,   405,   406,
-     512,   407,   404,   223,   223,   417,   223,   223,   415,   418,
-     419,   223,   420,   421,   422,   426,   430,   424,   425,   440,
-     447,   453,   223,   457,   532,   574,   458,   575,   576,   464,
-     459,   460,   462,   463,   466,   541,   467,   482,   476,   500,
-     483,   331,   484,   488,   501,   492,   499,   502,   503,   513,
-     514,   556,   515,   223,   516,   529,   517,   519,   538,   331,
-     331,   331,   505,   521,   523,   556,  -207,   524,   525,   223,
-     223,   526,   468,   469,   470,   530,   535,   302,   303,   536,
-     475,   547,   546,   223,   -69,     1,     2,   548,     3,     4,
-       5,   486,   487,   534,   549,   550,     6,     7,   551,   563,
-     472,   572,   573,   583,   578,   577,   223,   223,   588,   590,
-     591,   223,   592,   593,   223,   604,   606,     8,   603,   607,
-     223,     9,   618,   223,   -18,    10,   -19,   621,   619,   538,
-     624,   625,   630,   631,   633,   518,   247,   520,   248,   249,
-     522,   340,   133,   570,   339,   587,   149,   527,   528,   304,
+     408,   586,    58,   138,   360,   361,    61,   542,   393,   394,
+     395,   396,   397,    98,   155,   400,   401,   402,   427,   270,
+     271,   102,   362,   363,    99,   364,   365,   100,   366,   367,
+     368,   223,    86,   359,   223,   223,   103,   223,    49,    50,
+      51,   545,   104,    52,   223,     1,   131,   288,     3,    85,
+       5,    86,   223,   223,   223,    45,   504,    46,   505,   564,
+     565,   566,   132,   284,   122,   123,   124,   125,   126,   127,
+      29,    30,    31,    32,    33,    34,    35,   116,    36,   117,
+     454,   455,   114,   115,   155,   409,   410,   461,   601,   581,
+     142,   582,   605,   585,   143,   582,   148,   150,   168,   360,
+     361,   173,   155,   428,   331,   255,   257,   258,   223,   223,
+     223,   261,   264,   265,   268,   -56,   223,   362,   363,   595,
+     364,   365,   -57,   366,   367,   368,   -60,   223,   223,   443,
+     -59,   -58,   276,   111,   289,   450,   329,   612,   319,  -208,
+     320,   321,   322,   285,   323,   336,   506,   507,   508,   509,
+     331,   510,   511,   326,   387,   390,   327,   -69,     1,     2,
+     328,     3,     4,     5,   331,   478,   331,   331,   331,     6,
+       7,   223,   485,   223,   375,   376,   223,    37,    38,    39,
+     404,   389,   391,   223,   223,   392,   491,    63,    64,   417,
+       8,   543,   544,   426,     9,   418,   419,   420,    10,     1,
+       2,   421,     3,     4,     5,   403,   422,   430,   405,   406,
+     512,   407,   440,   223,   223,   447,   223,   223,   415,   453,
+     457,   223,   458,   459,   460,   462,   423,   424,   425,   464,
+     463,   466,   223,   467,   532,   574,   501,   575,   576,   476,
+     482,   483,   484,   488,   492,   541,   499,   502,   500,   513,
+     514,   331,   503,   515,   516,   517,   519,   505,   521,   523,
+     524,   556,   525,   223,   526,   530,   529,   535,   538,   331,
+     331,   331,   536,   534,   546,   556,  -207,   547,   550,   223,
+     223,   548,   468,   469,   470,   549,   563,   302,   303,   551,
+     475,   472,   577,   223,   -69,     1,     2,   572,     3,     4,
+       5,   486,   487,   573,   578,   583,     6,     7,   588,   590,
+     591,   592,   593,   604,   606,   607,   223,   223,   -18,   618,
+     -19,   223,   621,   624,   223,   619,   625,     8,   603,   630,
+     223,     9,   631,   223,   633,    10,   587,   247,   248,   538,
+     249,   133,   570,   339,    44,   518,   371,   520,   149,   145,
+     522,   340,   380,   130,    97,   567,     0,   527,   528,   304,
      305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
      315,   316,   317,   291,   292,   293,   294,   295,   296,   297,
-     298,   299,   300,   371,   145,    44,   130,   553,   554,   380,
-     558,   559,    97,   567,   474,   562,   174,   175,     0,     0,
+     298,   299,   300,   474,     0,     0,     0,   553,   554,     0,
+     558,   559,     0,     0,     0,   562,   174,   175,     0,     0,
       63,    64,   176,     0,     0,     0,   568,     0,     0,     0,
        0,     0,     1,     2,     0,     3,     4,     5,   177,   178,
      179,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -2402,67 +2402,67 @@
 {
        0,   230,   265,    27,   238,   342,   450,   241,   242,   243,
      244,   245,     4,     0,    11,   249,   166,    17,    11,    21,
-     128,     7,     8,    54,   154,    28,   167,    29,    34,    54,
-      17,   438,   439,    19,    20,    11,    22,    23,    24,    11,
-     121,   231,     7,     8,    38,    10,    11,    12,    13,    14,
+     128,    11,    28,    54,   231,    54,   154,    29,    54,    54,
+      17,   438,   439,   280,   281,   282,    21,    11,    58,    34,
+     121,   167,     7,     8,   251,    10,    11,    12,    13,    14,
       15,    16,    17,    77,    19,    20,    54,    22,    23,    24,
-      21,   251,   132,    54,    34,   154,    68,   155,    54,    58,
-     151,    54,   595,   280,   281,   282,   164,    53,   102,    11,
-      18,    53,   106,    53,    49,    17,   156,    54,   112,   612,
-     497,   155,    54,    93,   118,   154,   166,   541,    52,    54,
-     164,    40,    41,   173,   128,    54,   155,    68,    47,   155,
-      54,   555,   556,    67,    53,   164,   162,    20,   142,   143,
-      23,   152,   146,   155,   358,   266,   267,   152,   152,   160,
-     162,   137,   138,   139,    19,     0,   142,    22,   155,    24,
-     146,   147,   154,   137,   138,   139,    19,   164,   142,    22,
-     487,    24,   146,   147,   152,   599,   600,   158,   602,   603,
-     163,   152,   164,   160,   162,   156,   152,   160,    53,   152,
-     404,   163,    42,    43,    44,   158,   383,    47,   622,   623,
-     154,   518,   169,   520,   418,   152,   420,   421,   422,   156,
-     152,   153,   157,   158,    32,    33,   161,   152,   163,   164,
-     155,   156,    22,   152,   228,   155,   155,   156,   152,   153,
-     160,   152,   236,   237,   238,   239,   240,   241,   242,   243,
+     595,    11,   132,    53,   155,    38,    68,    17,    40,    41,
+     151,   155,   154,   164,    54,    47,    34,   612,   102,    53,
+     164,    53,   106,    68,    49,    18,   156,    54,   112,   155,
+     497,    52,    54,    93,   118,    53,   166,   541,   164,    54,
+     137,   138,   139,   173,   128,   142,    67,    54,   155,   146,
+     147,   555,   556,   155,   149,   150,   151,   164,   142,   143,
+     162,   152,   146,   152,   358,   155,   152,   152,   152,   158,
+     156,   162,   162,   155,    19,   160,   383,    22,   160,    24,
+     266,   267,   137,   138,   139,   154,    20,   142,   155,    23,
+     487,   146,   147,   160,   152,   599,   600,   163,   602,   603,
+      32,    33,   164,   160,   137,   138,   139,   160,    53,   142,
+     404,   163,   152,   146,   147,   155,   156,     0,   622,   623,
+     158,   518,   169,   520,   418,   152,   420,   421,   422,   156,
+     152,   153,   157,   158,   115,   116,   161,   152,   163,   164,
+     155,   156,   114,   115,   228,   152,   153,     3,     4,     5,
+       6,   154,   236,   237,   238,   239,   240,   241,   242,   243,
      244,   245,   246,   247,   248,   249,     3,     4,     5,     6,
-     338,   568,    37,   257,   119,   120,    22,   500,   319,   320,
+     338,   568,   154,   257,   119,   120,    22,   500,   319,   320,
      321,   322,   323,    22,   268,   326,   327,   328,   356,    26,
-      27,    22,   137,   138,    68,   140,   141,   155,   143,   144,
-     145,   331,   160,    53,   334,   335,     4,   337,   149,   150,
-     151,   505,     4,    46,   344,    48,    38,   173,     3,     4,
-       5,     6,   352,   353,   354,    35,    42,    37,    44,   523,
-     524,   525,   159,   443,    61,    62,    63,    64,    65,    66,
-      42,    43,    44,    45,    46,    47,    48,   153,    50,   155,
-     391,   392,   115,   116,   338,   339,   340,   398,   581,   153,
-     159,   155,   585,   153,   152,   155,   137,   138,   139,   119,
-     120,   142,   356,   357,   358,   146,   147,   156,   408,   409,
-     410,     4,   114,   115,    83,    84,   416,   137,   138,   578,
-     140,   141,    38,   143,   144,   145,    22,   427,   428,   383,
-     155,   153,   162,     4,   153,   389,     9,   596,   152,     0,
-       9,     9,     9,   443,     9,     9,   457,   458,   459,   460,
-     404,   462,   463,    54,    60,    11,   152,    18,    19,    20,
-     153,    22,    23,    24,   418,   419,   420,   421,   422,    30,
-      31,   471,   426,   473,   152,   152,   476,   149,   150,   151,
-      56,   152,   152,   483,   484,   152,   440,     7,     8,   152,
-      51,   502,   503,   152,    55,    22,   162,    22,    59,    19,
-      20,   152,    22,    23,    24,   331,   152,   152,   334,   335,
-     464,   337,   155,   513,   514,   155,   516,   517,   344,   155,
-     155,   521,   155,   155,   155,    38,     4,   353,   354,    38,
-     155,   155,   532,   155,   488,   546,   155,   548,   549,    38,
-     155,   155,   155,   155,   155,   499,   155,   155,   158,   153,
-     155,   505,   155,   155,    22,   162,   155,   155,   155,    17,
-      17,   515,   152,   563,   155,   152,   155,     4,   498,   523,
-     524,   525,   155,   155,   155,   529,     0,   155,   155,   579,
-     580,     4,   408,   409,   410,   155,    22,    26,    27,     4,
-     416,   153,   155,   593,    18,    19,    20,   155,    22,    23,
-      24,   427,   428,   162,   155,   153,    30,    31,   153,   155,
-      53,   153,   153,   160,   158,   155,   616,   617,    53,   153,
-     153,   621,   153,    17,   624,   160,     4,    51,   582,   148,
-     630,    55,    22,   633,   152,    59,   152,    17,   155,   569,
-      17,   155,    17,    73,    17,   471,   133,   473,   133,   133,
-     476,   235,    93,   542,   234,   569,   112,   483,   484,    98,
+      27,   152,   137,   138,    22,   140,   141,    22,   143,   144,
+     145,   331,    37,    53,   334,   335,     4,   337,    42,    43,
+      44,   505,     4,    47,   344,    19,    68,   173,    22,    35,
+      24,    37,   352,   353,   354,    46,   153,    48,   155,   523,
+     524,   525,    38,   443,    61,    62,    63,    64,    65,    66,
+      42,    43,    44,    45,    46,    47,    48,    42,    50,    44,
+     391,   392,    83,    84,   338,   339,   340,   398,   581,   153,
+     159,   155,   585,   153,   159,   155,   152,   156,     4,   119,
+     120,    38,   356,   357,   358,    22,   155,   153,   408,   409,
+     410,   162,     4,   153,   152,     9,   416,   137,   138,   578,
+     140,   141,     9,   143,   144,   145,     9,   427,   428,   383,
+       9,     9,     9,    54,    60,   389,    56,   596,   152,     0,
+     152,   152,   152,   443,   152,    11,   457,   458,   459,   460,
+     404,   462,   463,   152,    22,    22,   152,    18,    19,    20,
+     152,    22,    23,    24,   418,   419,   420,   421,   422,    30,
+      31,   471,   426,   473,   162,   153,   476,   149,   150,   151,
+     155,   152,   152,   483,   484,   152,   440,     7,     8,   155,
+      51,   502,   503,    38,    55,   155,   155,   155,    59,    19,
+      20,   155,    22,    23,    24,   331,   155,     4,   334,   335,
+     464,   337,    38,   513,   514,   155,   516,   517,   344,   155,
+     155,   521,   155,   155,   155,   155,   352,   353,   354,    38,
+     155,   155,   532,   155,   488,   546,    22,   548,   549,   158,
+     155,   155,   155,   155,   162,   499,   155,   155,   153,    17,
+      17,   505,   155,   152,   155,   155,     4,   155,   155,   155,
+     155,   515,   155,   563,     4,   155,   152,    22,   498,   523,
+     524,   525,     4,   162,   155,   529,     0,   153,   153,   579,
+     580,   155,   408,   409,   410,   155,   155,    26,    27,   153,
+     416,    53,   155,   593,    18,    19,    20,   153,    22,    23,
+      24,   427,   428,   153,   158,   160,    30,    31,    53,   153,
+     153,   153,    17,   160,     4,   148,   616,   617,   152,    22,
+     152,   621,    17,    17,   624,   155,   155,    51,   582,    17,
+     630,    55,    73,   633,    17,    59,   569,   133,   133,   569,
+     133,    93,   542,   234,    17,   471,   257,   473,   112,   106,
+     476,   235,   268,    89,    56,   529,    -1,   483,   484,    98,
       99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
      109,   110,   111,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   257,   106,    17,    89,   513,   514,   268,
-     516,   517,    56,   529,   415,   521,     3,     4,    -1,    -1,
+      99,   100,   101,   415,    -1,    -1,    -1,   513,   514,    -1,
+     516,   517,    -1,    -1,    -1,   521,     3,     4,    -1,    -1,
        7,     8,     9,    -1,    -1,    -1,   532,    -1,    -1,    -1,
       -1,    -1,    19,    20,    -1,    22,    23,    24,    25,    26,
       27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -2650,7 +2650,7 @@
       22,   152,   152,   206,   206,   206,   206,   206,   155,   162,
      206,   206,   206,   235,   155,   235,   235,   235,   202,   200,
      200,   155,   194,   155,   194,   235,   158,   155,   155,   155,
-     155,   155,   155,   234,   235,   235,    38,   202,   200,   236,
+     155,   155,   155,   235,   235,   235,    38,   202,   200,   236,
        4,   137,   138,   139,   142,   146,   147,   190,   218,   219,
       38,   160,   164,   200,   208,   162,   164,   155,   197,    39,
      200,   224,   225,   155,   206,   206,   246,   155,   155,   155,
@@ -3486,152 +3486,152 @@
   switch (yyn)
     {
         case 29:
-#line 1118 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1118 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;}
     break;
 
   case 30:
-#line 1118 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1118 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;}
     break;
 
   case 31:
-#line 1119 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1119 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;}
     break;
 
   case 32:
-#line 1119 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1119 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;}
     break;
 
   case 33:
-#line 1120 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1120 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;}
     break;
 
   case 34:
-#line 1120 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1120 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;}
     break;
 
   case 35:
-#line 1121 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1121 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;}
     break;
 
   case 36:
-#line 1121 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1121 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;}
     break;
 
   case 37:
-#line 1122 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1122 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;}
     break;
 
   case 38:
-#line 1122 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1122 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;}
     break;
 
   case 39:
-#line 1126 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1126 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;}
     break;
 
   case 40:
-#line 1126 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1126 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;}
     break;
 
   case 41:
-#line 1127 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1127 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;}
     break;
 
   case 42:
-#line 1127 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1127 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;}
     break;
 
   case 43:
-#line 1128 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1128 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;}
     break;
 
   case 44:
-#line 1128 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1128 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;}
     break;
 
   case 45:
-#line 1129 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1129 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;}
     break;
 
   case 46:
-#line 1129 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1129 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;}
     break;
 
   case 47:
-#line 1130 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1130 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;}
     break;
 
   case 48:
-#line 1130 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1130 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;}
     break;
 
   case 49:
-#line 1131 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1131 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;}
     break;
 
   case 50:
-#line 1131 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1131 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;}
     break;
 
   case 51:
-#line 1132 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1132 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;}
     break;
 
   case 52:
-#line 1132 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1132 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;}
     break;
 
   case 53:
-#line 1133 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1133 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;}
     break;
 
   case 54:
-#line 1134 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1134 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;}
     break;
 
   case 65:
-#line 1143 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1143 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 66:
-#line 1145 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1145 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal)=(yyvsp[(3) - (4)].UInt64Val); ;}
     break;
 
   case 67:
-#line 1146 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1146 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal)=0; ;}
     break;
 
   case 68:
-#line 1150 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1150 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
@@ -3639,7 +3639,7 @@
     break;
 
   case 69:
-#line 1154 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1154 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3647,7 +3647,7 @@
     break;
 
   case 73:
-#line 1162 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1162 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3655,7 +3655,7 @@
     break;
 
   case 74:
-#line 1167 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1167 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
@@ -3663,152 +3663,152 @@
     break;
 
   case 75:
-#line 1173 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1173 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 76:
-#line 1174 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1174 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 77:
-#line 1175 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1175 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 78:
-#line 1176 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1176 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
     break;
 
   case 79:
-#line 1177 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1177 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 80:
-#line 1181 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1181 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 81:
-#line 1182 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1182 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 82:
-#line 1183 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1183 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 83:
-#line 1187 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1187 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
     break;
 
   case 84:
-#line 1188 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1188 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
     break;
 
   case 85:
-#line 1189 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1189 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::HiddenVisibility;    ;}
     break;
 
   case 86:
-#line 1190 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1190 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::ProtectedVisibility; ;}
     break;
 
   case 87:
-#line 1194 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1194 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 88:
-#line 1195 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1195 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 89:
-#line 1196 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1196 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 90:
-#line 1200 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1200 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 91:
-#line 1201 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1201 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 92:
-#line 1202 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1202 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 93:
-#line 1203 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1203 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 94:
-#line 1204 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1204 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 95:
-#line 1208 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1208 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 96:
-#line 1209 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1209 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 97:
-#line 1210 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1210 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 98:
-#line 1213 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1213 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 99:
-#line 1214 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1214 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 100:
-#line 1215 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1215 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Fast; ;}
     break;
 
   case 101:
-#line 1216 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1216 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Cold; ;}
     break;
 
   case 102:
-#line 1217 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1217 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
     break;
 
   case 103:
-#line 1218 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1218 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
     break;
 
   case 104:
-#line 1219 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1219 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                    if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
                      GEN_ERROR("Calling conv too large");
@@ -3818,129 +3818,129 @@
     break;
 
   case 105:
-#line 1226 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1226 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
     break;
 
   case 106:
-#line 1227 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1227 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
     break;
 
   case 107:
-#line 1228 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1228 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
     break;
 
   case 108:
-#line 1229 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1229 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
     break;
 
   case 109:
-#line 1230 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1230 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::InReg;     ;}
     break;
 
   case 110:
-#line 1231 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1231 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::StructRet; ;}
     break;
 
   case 111:
-#line 1232 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1232 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoAlias;   ;}
     break;
 
   case 112:
-#line 1233 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1233 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ByVal;     ;}
     break;
 
   case 113:
-#line 1234 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1234 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::Nest;      ;}
     break;
 
   case 114:
-#line 1235 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1235 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = 
                           ParamAttr::constructAlignmentFromInt((yyvsp[(2) - (2)].UInt64Val));    ;}
     break;
 
   case 115:
-#line 1239 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1239 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::None; ;}
     break;
 
   case 116:
-#line 1240 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1240 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
               ;}
     break;
 
   case 117:
-#line 1245 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1245 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoReturn; ;}
     break;
 
   case 118:
-#line 1246 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1246 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoUnwind; ;}
     break;
 
   case 119:
-#line 1247 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1247 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ZExt;     ;}
     break;
 
   case 120:
-#line 1248 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1248 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::SExt;     ;}
     break;
 
   case 121:
-#line 1249 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1249 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ReadNone; ;}
     break;
 
   case 122:
-#line 1250 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1250 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ReadOnly; ;}
     break;
 
   case 123:
-#line 1253 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1253 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::None; ;}
     break;
 
   case 124:
-#line 1254 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1254 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
               ;}
     break;
 
   case 125:
-#line 1259 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1259 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 126:
-#line 1260 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1260 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal);
               ;}
     break;
 
   case 127:
-#line 1267 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1267 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 128:
-#line 1268 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1268 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3950,12 +3950,12 @@
     break;
 
   case 129:
-#line 1274 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1274 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 130:
-#line 1275 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1275 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3965,7 +3965,7 @@
     break;
 
   case 131:
-#line 1284 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1284 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   for (unsigned i = 0, e = (yyvsp[(2) - (2)].StrVal)->length(); i != e; ++i)
     if ((*(yyvsp[(2) - (2)].StrVal))[i] == '"' || (*(yyvsp[(2) - (2)].StrVal))[i] == '\\')
@@ -3976,27 +3976,27 @@
     break;
 
   case 132:
-#line 1292 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1292 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 133:
-#line 1293 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1293 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;}
     break;
 
   case 134:
-#line 1298 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1298 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 135:
-#line 1299 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1299 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 136:
-#line 1300 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1300 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV->setSection(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -4005,7 +4005,7 @@
     break;
 
   case 137:
-#line 1305 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1305 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(2) - (2)].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[(2) - (2)].UInt64Val)))
       GEN_ERROR("Alignment must be a power of two");
@@ -4015,7 +4015,7 @@
     break;
 
   case 145:
-#line 1321 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1321 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
@@ -4023,7 +4023,7 @@
     break;
 
   case 146:
-#line 1325 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1325 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder((yyvsp[(1) - (1)].PrimType));
     CHECK_FOR_ERROR
@@ -4031,7 +4031,7 @@
     break;
 
   case 147:
-#line 1329 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1329 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {                             // Pointer type?
     if (*(yyvsp[(1) - (3)].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
@@ -4042,7 +4042,7 @@
     break;
 
   case 148:
-#line 1336 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1336 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {            // Named types are also simple types...
     const Type* tmp = getTypeVal((yyvsp[(1) - (1)].ValIDVal));
     CHECK_FOR_ERROR
@@ -4051,7 +4051,7 @@
     break;
 
   case 149:
-#line 1341 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1341 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Type UpReference
     if ((yyvsp[(2) - (2)].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
@@ -4063,7 +4063,7 @@
     break;
 
   case 150:
-#line 1349 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1349 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4096,7 +4096,7 @@
     break;
 
   case 151:
-#line 1378 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1378 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4124,7 +4124,7 @@
     break;
 
   case 152:
-#line 1403 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1403 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Sized array type?
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[(4) - (5)].TypeVal), (unsigned)(yyvsp[(2) - (5)].UInt64Val))));
     delete (yyvsp[(4) - (5)].TypeVal);
@@ -4133,7 +4133,7 @@
     break;
 
   case 153:
-#line 1408 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1408 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Vector type?
      const llvm::Type* ElemTy = (yyvsp[(4) - (5)].TypeVal)->get();
      if ((unsigned)(yyvsp[(2) - (5)].UInt64Val) != (yyvsp[(2) - (5)].UInt64Val))
@@ -4147,7 +4147,7 @@
     break;
 
   case 154:
-#line 1418 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1418 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(),
@@ -4161,7 +4161,7 @@
     break;
 
   case 155:
-#line 1428 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1428 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
@@ -4169,7 +4169,7 @@
     break;
 
   case 156:
-#line 1432 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1432 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(),
@@ -4183,7 +4183,7 @@
     break;
 
   case 157:
-#line 1442 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1442 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {                         // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
     CHECK_FOR_ERROR
@@ -4191,7 +4191,7 @@
     break;
 
   case 158:
-#line 1449 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1449 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4201,7 +4201,7 @@
     break;
 
   case 159:
-#line 1458 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1458 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal))->getDescription());
@@ -4212,14 +4212,14 @@
     break;
 
   case 160:
-#line 1465 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1465 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
   ;}
     break;
 
   case 161:
-#line 1470 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1470 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     (yyval.TypeWithAttrsList)->push_back((yyvsp[(1) - (1)].TypeWithAttrs));
@@ -4228,7 +4228,7 @@
     break;
 
   case 162:
-#line 1475 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1475 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList))->push_back((yyvsp[(3) - (3)].TypeWithAttrs));
     CHECK_FOR_ERROR
@@ -4236,7 +4236,7 @@
     break;
 
   case 164:
-#line 1483 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1483 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList);
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
@@ -4247,7 +4247,7 @@
     break;
 
   case 165:
-#line 1490 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1490 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
@@ -4258,7 +4258,7 @@
     break;
 
   case 166:
-#line 1497 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1497 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
@@ -4266,7 +4266,7 @@
     break;
 
   case 167:
-#line 1505 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1505 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     (yyval.TypeList)->push_back(*(yyvsp[(1) - (1)].TypeVal)); 
@@ -4276,7 +4276,7 @@
     break;
 
   case 168:
-#line 1511 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1511 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(*(yyvsp[(3) - (3)].TypeVal)); 
     delete (yyvsp[(3) - (3)].TypeVal);
@@ -4285,7 +4285,7 @@
     break;
 
   case 169:
-#line 1523 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1523 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
@@ -4317,7 +4317,7 @@
     break;
 
   case 170:
-#line 1551 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1551 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4337,7 +4337,7 @@
     break;
 
   case 171:
-#line 1567 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1567 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4368,7 +4368,7 @@
     break;
 
   case 172:
-#line 1594 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1594 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
@@ -4400,7 +4400,7 @@
     break;
 
   case 173:
-#line 1622 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1622 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (STy == 0)
@@ -4430,7 +4430,7 @@
     break;
 
   case 174:
-#line 1648 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1648 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4454,7 +4454,7 @@
     break;
 
   case 175:
-#line 1668 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1668 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (6)].TypeVal)->get());
     if (STy == 0)
@@ -4484,7 +4484,7 @@
     break;
 
   case 176:
-#line 1694 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1694 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (5)].TypeVal))->getDescription());
@@ -4508,7 +4508,7 @@
     break;
 
   case 177:
-#line 1714 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1714 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4524,7 +4524,7 @@
     break;
 
   case 178:
-#line 1726 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1726 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4535,7 +4535,7 @@
     break;
 
   case 179:
-#line 1733 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1733 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4605,7 +4605,7 @@
     break;
 
   case 180:
-#line 1799 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1799 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4619,7 +4619,7 @@
     break;
 
   case 181:
-#line 1809 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1809 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4633,7 +4633,7 @@
     break;
 
   case 182:
-#line 1819 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1819 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].SInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type");
@@ -4643,7 +4643,7 @@
     break;
 
   case 183:
-#line 1825 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1825 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth();
     if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) {
@@ -4657,7 +4657,7 @@
     break;
 
   case 184:
-#line 1835 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1835 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].UInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type");
@@ -4667,7 +4667,7 @@
     break;
 
   case 185:
-#line 1841 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1841 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth();
     if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) {
@@ -4681,7 +4681,7 @@
     break;
 
   case 186:
-#line 1851 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1851 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
     assert(cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() == 1 && "Not Bool?");
     (yyval.ConstVal) = ConstantInt::getTrue();
@@ -4690,7 +4690,7 @@
     break;
 
   case 187:
-#line 1856 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1856 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
     assert(cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() == 1 && "Not Bool?");
     (yyval.ConstVal) = ConstantInt::getFalse();
@@ -4699,7 +4699,7 @@
     break;
 
   case 188:
-#line 1861 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1861 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Floating point constants
     if (!ConstantFP::isValueValidForType((yyvsp[(1) - (2)].PrimType), *(yyvsp[(2) - (2)].FPVal)))
       GEN_ERROR("Floating point constant invalid for type");
@@ -4714,7 +4714,7 @@
     break;
 
   case 189:
-#line 1874 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1874 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (6)].TypeVal))->getDescription());
@@ -4730,7 +4730,7 @@
     break;
 
   case 190:
-#line 1886 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1886 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand");
@@ -4756,7 +4756,7 @@
     break;
 
   case 191:
-#line 1908 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1908 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (8)].ConstVal)->getType() != Type::Int1Ty)
       GEN_ERROR("Select condition must be of boolean type");
@@ -4768,7 +4768,7 @@
     break;
 
   case 192:
-#line 1916 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1916 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match");
@@ -4778,7 +4778,7 @@
     break;
 
   case 193:
-#line 1922 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1922 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match");
@@ -4793,7 +4793,7 @@
     break;
 
   case 194:
-#line 1933 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1933 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match");
@@ -4802,7 +4802,7 @@
     break;
 
   case 195:
-#line 1938 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1938 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match");
@@ -4811,7 +4811,7 @@
     break;
 
   case 196:
-#line 1943 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1943 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -4821,7 +4821,7 @@
     break;
 
   case 197:
-#line 1949 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1949 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal)))
       GEN_ERROR("Invalid insertelement operands");
@@ -4831,7 +4831,7 @@
     break;
 
   case 198:
-#line 1955 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1955 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal)))
       GEN_ERROR("Invalid shufflevector operands");
@@ -4841,7 +4841,7 @@
     break;
 
   case 199:
-#line 1964 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1964 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal));
     CHECK_FOR_ERROR
@@ -4849,7 +4849,7 @@
     break;
 
   case 200:
-#line 1968 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1968 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal));
@@ -4858,27 +4858,27 @@
     break;
 
   case 201:
-#line 1976 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1976 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 202:
-#line 1976 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1976 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 203:
-#line 1979 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1979 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 204:
-#line 1979 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1979 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 205:
-#line 1982 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1982 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const Type* VTy = (yyvsp[(1) - (2)].TypeVal)->get();
     Value *V = getVal(VTy, (yyvsp[(2) - (2)].ValIDVal));
@@ -4894,7 +4894,7 @@
     break;
 
   case 206:
-#line 1994 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1994 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Constant *Val = (yyvsp[(3) - (6)].ConstVal);
     const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get();
@@ -4910,7 +4910,7 @@
     break;
 
   case 207:
-#line 2015 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2015 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -4919,7 +4919,7 @@
     break;
 
   case 208:
-#line 2020 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2020 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -4928,12 +4928,12 @@
     break;
 
   case 211:
-#line 2033 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2033 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = false; ;}
     break;
 
   case 212:
-#line 2033 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2033 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
@@ -4941,26 +4941,26 @@
     break;
 
   case 213:
-#line 2037 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2037 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
   case 214:
-#line 2037 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2037 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 215:
-#line 2040 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2040 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 216:
-#line 2043 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2043 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (3)].TypeVal))->getDescription());
@@ -4988,7 +4988,7 @@
     break;
 
   case 217:
-#line 2067 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2067 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ResolveTypeTo((yyvsp[(1) - (3)].StrVal), (yyvsp[(3) - (3)].PrimType));
 
@@ -5003,7 +5003,7 @@
     break;
 
   case 218:
-#line 2079 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2079 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
     /* "Externally Visible" Linkage */
     if ((yyvsp[(5) - (6)].ConstVal) == 0) 
@@ -5015,14 +5015,14 @@
     break;
 
   case 219:
-#line 2086 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2086 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 220:
-#line 2090 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2090 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(6) - (7)].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant");
@@ -5032,14 +5032,14 @@
     break;
 
   case 221:
-#line 2095 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2095 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 222:
-#line 2099 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2099 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(6) - (7)].TypeVal))->getDescription());
@@ -5050,7 +5050,7 @@
     break;
 
   case 223:
-#line 2105 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2105 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
@@ -5058,7 +5058,7 @@
     break;
 
   case 224:
-#line 2109 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2109 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::string Name;
     if ((yyvsp[(1) - (5)].StrVal)) {
@@ -5102,21 +5102,21 @@
     break;
 
   case 225:
-#line 2149 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2149 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 226:
-#line 2152 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2152 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 227:
-#line 2158 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2158 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   if (AsmSoFar.empty())
@@ -5129,7 +5129,7 @@
     break;
 
   case 228:
-#line 2168 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2168 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
@@ -5137,7 +5137,7 @@
     break;
 
   case 229:
-#line 2172 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2172 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
@@ -5145,7 +5145,7 @@
     break;
 
   case 231:
-#line 2179 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2179 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(3) - (3)].StrVal));
           delete (yyvsp[(3) - (3)].StrVal);
@@ -5154,7 +5154,7 @@
     break;
 
   case 232:
-#line 2184 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2184 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(1) - (1)].StrVal));
           delete (yyvsp[(1) - (1)].StrVal);
@@ -5163,14 +5163,14 @@
     break;
 
   case 233:
-#line 2189 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2189 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
   case 234:
-#line 2198 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2198 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -5184,7 +5184,7 @@
     break;
 
   case 235:
-#line 2208 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2208 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -5198,7 +5198,7 @@
     break;
 
   case 236:
-#line 2219 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2219 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList);
     CHECK_FOR_ERROR
@@ -5206,7 +5206,7 @@
     break;
 
   case 237:
-#line 2223 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2223 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList);
     struct ArgListEntry E;
@@ -5219,7 +5219,7 @@
     break;
 
   case 238:
-#line 2232 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2232 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
@@ -5232,7 +5232,7 @@
     break;
 
   case 239:
-#line 2241 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2241 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
@@ -5240,7 +5240,7 @@
     break;
 
   case 240:
-#line 2247 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2247 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   std::string FunctionName(*(yyvsp[(3) - (10)].StrVal));
   delete (yyvsp[(3) - (10)].StrVal);  // Free strdup'd memory!
@@ -5371,7 +5371,7 @@
     break;
 
   case 243:
-#line 2377 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2377 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -5383,7 +5383,7 @@
     break;
 
   case 246:
-#line 2388 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2388 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
   CHECK_FOR_ERROR
@@ -5391,7 +5391,7 @@
     break;
 
   case 247:
-#line 2393 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2393 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.CurrentFunction->setLinkage((yyvsp[(1) - (3)].Linkage));
     CurFun.CurrentFunction->setVisibility((yyvsp[(2) - (3)].Visibility));
@@ -5402,7 +5402,7 @@
     break;
 
   case 248:
-#line 2405 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2405 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -5410,7 +5410,7 @@
     break;
 
   case 249:
-#line 2409 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2409 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -5418,7 +5418,7 @@
     break;
 
   case 250:
-#line 2414 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2414 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val));
     CHECK_FOR_ERROR
@@ -5426,7 +5426,7 @@
     break;
 
   case 251:
-#line 2418 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2418 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val));
     CHECK_FOR_ERROR
@@ -5434,7 +5434,7 @@
     break;
 
   case 252:
-#line 2422 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2422 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal));
     CHECK_FOR_ERROR
@@ -5442,7 +5442,7 @@
     break;
 
   case 253:
-#line 2426 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2426 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
@@ -5450,7 +5450,7 @@
     break;
 
   case 254:
-#line 2430 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2430 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
@@ -5458,7 +5458,7 @@
     break;
 
   case 255:
-#line 2434 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2434 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
@@ -5466,7 +5466,7 @@
     break;
 
   case 256:
-#line 2438 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2438 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
@@ -5474,7 +5474,7 @@
     break;
 
   case 257:
-#line 2442 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2442 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
@@ -5482,7 +5482,7 @@
     break;
 
   case 258:
-#line 2446 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2446 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
     int NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); 
@@ -5511,7 +5511,7 @@
     break;
 
   case 259:
-#line 2471 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2471 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal));
     CHECK_FOR_ERROR
@@ -5519,7 +5519,7 @@
     break;
 
   case 260:
-#line 2475 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2475 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createInlineAsm(*(yyvsp[(3) - (5)].StrVal), *(yyvsp[(5) - (5)].StrVal), (yyvsp[(2) - (5)].BoolVal));
     delete (yyvsp[(3) - (5)].StrVal);
@@ -5529,7 +5529,7 @@
     break;
 
   case 261:
-#line 2485 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2485 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::createLocalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
@@ -5537,7 +5537,7 @@
     break;
 
   case 262:
-#line 2489 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2489 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
@@ -5545,7 +5545,7 @@
     break;
 
   case 263:
-#line 2493 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2493 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -5554,7 +5554,7 @@
     break;
 
   case 264:
-#line 2498 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2498 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createGlobalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -5563,7 +5563,7 @@
     break;
 
   case 267:
-#line 2511 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2511 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -5574,7 +5574,7 @@
     break;
 
   case 268:
-#line 2520 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2520 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = new std::vector<Value *>();
     (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal)); 
@@ -5583,7 +5583,7 @@
     break;
 
   case 269:
-#line 2525 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2525 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ValueList)=(yyvsp[(1) - (3)].ValueList))->push_back((yyvsp[(3) - (3)].ValueVal)); 
     CHECK_FOR_ERROR
@@ -5591,7 +5591,7 @@
     break;
 
   case 270:
-#line 2530 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2530 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
@@ -5599,7 +5599,7 @@
     break;
 
   case 271:
-#line 2534 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2534 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks   
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
@@ -5607,7 +5607,7 @@
     break;
 
   case 272:
-#line 2543 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2543 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[(3) - (3)].TermInstVal), (yyvsp[(2) - (3)].StrVal));
     CHECK_FOR_ERROR
@@ -5619,7 +5619,7 @@
     break;
 
   case 273:
-#line 2552 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2552 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[(2) - (2)].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
@@ -5632,7 +5632,7 @@
     break;
 
   case 274:
-#line 2561 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2561 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Empty space between instruction lists
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum), 0);
     CHECK_FOR_ERROR
@@ -5640,7 +5640,7 @@
     break;
 
   case 275:
-#line 2565 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2565 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {   // Only the unwind to block
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum), getBBVal((yyvsp[(3) - (3)].ValIDVal)));
     CHECK_FOR_ERROR
@@ -5648,7 +5648,7 @@
     break;
 
   case 276:
-#line 2569 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2569 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {             // Labelled (named) basic block
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal)), 0);
     delete (yyvsp[(1) - (1)].StrVal);
@@ -5657,7 +5657,7 @@
     break;
 
   case 277:
-#line 2574 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2574 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (4)].StrVal)), getBBVal((yyvsp[(4) - (4)].ValIDVal)));
     delete (yyvsp[(1) - (4)].StrVal);
@@ -5666,7 +5666,7 @@
     break;
 
   case 278:
-#line 2581 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2581 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Return with a result...
     ValueList &VL = *(yyvsp[(2) - (2)].ValueList);
     assert(!VL.empty() && "Invalid ret operands!");
@@ -5677,7 +5677,7 @@
     break;
 
   case 279:
-#line 2588 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2588 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {                                    // Return with no result...
     (yyval.TermInstVal) = ReturnInst::Create();
     CHECK_FOR_ERROR
@@ -5685,7 +5685,7 @@
     break;
 
   case 280:
-#line 2592 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2592 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {                           // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal));
     CHECK_FOR_ERROR
@@ -5694,7 +5694,7 @@
     break;
 
   case 281:
-#line 2597 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2597 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {  
     assert(cast<IntegerType>((yyvsp[(2) - (9)].PrimType))->getBitWidth() == 1 && "Not Bool?");
     BasicBlock* tmpBBA = getBBVal((yyvsp[(6) - (9)].ValIDVal));
@@ -5708,7 +5708,7 @@
     break;
 
   case 282:
-#line 2607 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2607 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType), (yyvsp[(3) - (9)].ValIDVal));
     CHECK_FOR_ERROR
@@ -5731,7 +5731,7 @@
     break;
 
   case 283:
-#line 2626 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2626 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType), (yyvsp[(3) - (8)].ValIDVal));
     CHECK_FOR_ERROR
@@ -5744,7 +5744,7 @@
     break;
 
   case 284:
-#line 2636 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2636 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -5832,7 +5832,7 @@
     break;
 
   case 285:
-#line 2720 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2720 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
@@ -5840,7 +5840,7 @@
     break;
 
   case 286:
-#line 2724 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2724 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
@@ -5848,7 +5848,7 @@
     break;
 
   case 287:
-#line 2731 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2731 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable);
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal)));
@@ -5863,7 +5863,7 @@
     break;
 
   case 288:
-#line 2742 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2742 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(1) - (5)].PrimType), (yyvsp[(2) - (5)].ValIDVal)));
@@ -5879,7 +5879,7 @@
     break;
 
   case 289:
-#line 2755 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2755 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Is this definition named?? if so, assign the name...
     setValueName((yyvsp[(2) - (2)].InstVal), (yyvsp[(1) - (2)].StrVal));
@@ -5891,7 +5891,7 @@
     break;
 
   case 290:
-#line 2765 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2765 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (6)].TypeVal))->getDescription());
@@ -5906,7 +5906,7 @@
     break;
 
   case 291:
-#line 2776 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2776 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.PHIList) = (yyvsp[(1) - (7)].PHIList);
     Value* tmpVal = getVal((yyvsp[(1) - (7)].PHIList)->front().first->getType(), (yyvsp[(4) - (7)].ValIDVal));
@@ -5918,7 +5918,7 @@
     break;
 
   case 292:
-#line 2786 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2786 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
@@ -5933,7 +5933,7 @@
     break;
 
   case 293:
-#line 2797 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2797 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     // Labels are only valid in ASMs
@@ -5945,7 +5945,7 @@
     break;
 
   case 294:
-#line 2805 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2805 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
@@ -5959,7 +5959,7 @@
     break;
 
   case 295:
-#line 2815 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2815 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     (yyval.ParamList) = (yyvsp[(1) - (6)].ParamList);
@@ -5970,17 +5970,17 @@
     break;
 
   case 296:
-#line 2822 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2822 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamList) = new ParamList(); ;}
     break;
 
   case 297:
-#line 2825 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2825 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = new std::vector<Value*>(); ;}
     break;
 
   case 298:
-#line 2826 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2826 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList);
     (yyval.ValueList)->push_back((yyvsp[(3) - (3)].ValueVal));
@@ -5989,7 +5989,7 @@
     break;
 
   case 299:
-#line 2833 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2833 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -5997,7 +5997,7 @@
     break;
 
   case 300:
-#line 2837 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2837 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -6005,7 +6005,7 @@
     break;
 
   case 301:
-#line 2842 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2842 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6025,7 +6025,7 @@
     break;
 
   case 302:
-#line 2858 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2858 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6046,7 +6046,7 @@
     break;
 
   case 303:
-#line 2875 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2875 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6064,7 +6064,7 @@
     break;
 
   case 304:
-#line 2889 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2889 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6082,7 +6082,7 @@
     break;
 
   case 305:
-#line 2903 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2903 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6098,7 +6098,7 @@
     break;
 
   case 306:
-#line 2915 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2915 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(2) - (6)].ValueVal)->getType() != Type::Int1Ty)
       GEN_ERROR("select condition must be boolean");
@@ -6110,7 +6110,7 @@
     break;
 
   case 307:
-#line 2923 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2923 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6121,7 +6121,7 @@
     break;
 
   case 308:
-#line 2930 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2930 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -6131,7 +6131,7 @@
     break;
 
   case 309:
-#line 2936 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2936 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal)))
       GEN_ERROR("Invalid insertelement operands");
@@ -6141,7 +6141,7 @@
     break;
 
   case 310:
-#line 2942 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2942 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal)))
       GEN_ERROR("Invalid shufflevector operands");
@@ -6151,7 +6151,7 @@
     break;
 
   case 311:
-#line 2948 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2948 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[(2) - (2)].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -6170,7 +6170,7 @@
     break;
 
   case 312:
-#line 2964 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2964 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -6263,7 +6263,7 @@
     break;
 
   case 313:
-#line 3053 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3053 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal);
     CHECK_FOR_ERROR
@@ -6271,7 +6271,7 @@
     break;
 
   case 314:
-#line 3058 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3058 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -6279,7 +6279,7 @@
     break;
 
   case 315:
-#line 3062 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3062 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -6287,7 +6287,7 @@
     break;
 
   case 316:
-#line 3069 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3069 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6298,7 +6298,7 @@
     break;
 
   case 317:
-#line 3076 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3076 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6310,7 +6310,7 @@
     break;
 
   case 318:
-#line 3084 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3084 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6321,7 +6321,7 @@
     break;
 
   case 319:
-#line 3091 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3091 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6333,7 +6333,7 @@
     break;
 
   case 320:
-#line 3099 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3099 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(2) - (2)].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
@@ -6344,7 +6344,7 @@
     break;
 
   case 321:
-#line 3107 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3107 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -6362,7 +6362,7 @@
     break;
 
   case 322:
-#line 3121 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3121 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (7)].TypeVal))->getDescription());
@@ -6383,7 +6383,7 @@
     break;
 
   case 323:
-#line 3138 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3138 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   Value *TmpVal = getVal((yyvsp[(2) - (5)].TypeVal)->get(), (yyvsp[(3) - (5)].ValIDVal));
   if (!GetResultInst::isValidOperands(TmpVal, (yyvsp[(5) - (5)].UInt64Val)))
@@ -6395,7 +6395,7 @@
     break;
 
   case 324:
-#line 3146 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3146 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
@@ -6629,7 +6629,7 @@
 }
 
 
-#line 3163 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3163 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs?rev=50175&r1=50174&r2=50175&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs Wed Apr 23 15:11:27 2008
@@ -346,7 +346,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 950 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 950 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y?rev=50175&r1=50174&r2=50175&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Wed Apr 23 15:11:27 2008
@@ -3135,7 +3135,7 @@
     $$ = new StoreInst($3, tmpVal, $1, $7);
     delete $5;
   }
-| GETRESULT Types SymbolicValueRef ',' EUINT64VAL  {
+| GETRESULT Types ValueRef ',' EUINT64VAL  {
   Value *TmpVal = getVal($2->get(), $3);
   if (!GetResultInst::isValidOperands(TmpVal, $5))
       GEN_ERROR("Invalid getresult operands");

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs?rev=50175&r1=50174&r2=50175&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs Wed Apr 23 15:11:27 2008
@@ -3135,7 +3135,7 @@
     $$ = new StoreInst($3, tmpVal, $1, $7);
     delete $5;
   }
-| GETRESULT Types SymbolicValueRef ',' EUINT64VAL  {
+| GETRESULT Types ValueRef ',' EUINT64VAL  {
   Value *TmpVal = getVal($2->get(), $3);
   if (!GetResultInst::isValidOperands(TmpVal, $5))
       GEN_ERROR("Invalid getresult operands");





More information about the llvm-commits mailing list