diff --git a/lib/AsmParser/llvmAsmParser.cpp.cvs b/lib/AsmParser/llvmAsmParser.cpp.cvs
index 5ff43adb934..d1b74f725bf 100644
--- a/lib/AsmParser/llvmAsmParser.cpp.cvs
+++ b/lib/AsmParser/llvmAsmParser.cpp.cvs
@@ -378,7 +378,7 @@
 
 
 /* Copy the first part of user declarations.  */
-#line 14 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1338,7 +1338,7 @@ Module *llvm::RunVMAsmParser(llvm::MemoryBuffer *MB) {
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 953 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 953 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -3474,152 +3474,152 @@ yyreduce:
   switch (yyn)
     {
         case 29:
-#line 1121 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1121 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;}
     break;
 
   case 30:
-#line 1121 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1121 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;}
     break;
 
   case 31:
-#line 1122 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1122 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;}
     break;
 
   case 32:
-#line 1122 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1122 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;}
     break;
 
   case 33:
-#line 1123 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1123 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;}
     break;
 
   case 34:
-#line 1123 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1123 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;}
     break;
 
   case 35:
-#line 1124 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1124 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;}
     break;
 
   case 36:
-#line 1124 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1124 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;}
     break;
 
   case 37:
-#line 1125 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1125 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;}
     break;
 
   case 38:
-#line 1125 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1125 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;}
     break;
 
   case 39:
-#line 1129 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1129 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;}
     break;
 
   case 40:
-#line 1129 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1129 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;}
     break;
 
   case 41:
-#line 1130 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1130 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;}
     break;
 
   case 42:
-#line 1130 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1130 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;}
     break;
 
   case 43:
-#line 1131 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1131 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;}
     break;
 
   case 44:
-#line 1131 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1131 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;}
     break;
 
   case 45:
-#line 1132 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1132 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;}
     break;
 
   case 46:
-#line 1132 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1132 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;}
     break;
 
   case 47:
-#line 1133 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1133 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;}
     break;
 
   case 48:
-#line 1133 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1133 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;}
     break;
 
   case 49:
-#line 1134 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1134 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;}
     break;
 
   case 50:
-#line 1134 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1134 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;}
     break;
 
   case 51:
-#line 1135 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1135 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;}
     break;
 
   case 52:
-#line 1135 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1135 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;}
     break;
 
   case 53:
-#line 1136 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1136 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;}
     break;
 
   case 54:
-#line 1137 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1137 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;}
     break;
 
   case 65:
-#line 1146 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1146 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 66:
-#line 1148 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1148 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal)=(yyvsp[(3) - (4)].UInt64Val); ;}
     break;
 
   case 67:
-#line 1149 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1149 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal)=0; ;}
     break;
 
   case 68:
-#line 1153 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1153 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
@@ -3627,7 +3627,7 @@ yyreduce:
     break;
 
   case 69:
-#line 1157 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1157 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3635,7 +3635,7 @@ yyreduce:
     break;
 
   case 73:
-#line 1165 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1165 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3643,7 +3643,7 @@ yyreduce:
     break;
 
   case 74:
-#line 1170 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1170 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
@@ -3651,152 +3651,152 @@ yyreduce:
     break;
 
   case 75:
-#line 1176 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1176 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 76:
-#line 1177 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1177 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 77:
-#line 1178 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1178 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 78:
-#line 1179 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1179 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
     break;
 
   case 79:
-#line 1180 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1180 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 80:
-#line 1184 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1184 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 81:
-#line 1185 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1185 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 82:
-#line 1186 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1186 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 83:
-#line 1190 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1190 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
     break;
 
   case 84:
-#line 1191 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1191 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
     break;
 
   case 85:
-#line 1192 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1192 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::HiddenVisibility;    ;}
     break;
 
   case 86:
-#line 1193 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1193 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::ProtectedVisibility; ;}
     break;
 
   case 87:
-#line 1197 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1197 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 88:
-#line 1198 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1198 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 89:
-#line 1199 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1199 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 90:
-#line 1203 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1203 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 91:
-#line 1204 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1204 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 92:
-#line 1205 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1205 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 93:
-#line 1206 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1206 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 94:
-#line 1207 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1207 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 95:
-#line 1211 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1211 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 96:
-#line 1212 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1212 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 97:
-#line 1213 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1213 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 98:
-#line 1216 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1216 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 99:
-#line 1217 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1217 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 100:
-#line 1218 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1218 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Fast; ;}
     break;
 
   case 101:
-#line 1219 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1219 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Cold; ;}
     break;
 
   case 102:
-#line 1220 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1220 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
     break;
 
   case 103:
-#line 1221 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1221 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
     break;
 
   case 104:
-#line 1222 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1222 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                    if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
                      GEN_ERROR("Calling conv too large");
@@ -3806,129 +3806,129 @@ yyreduce:
     break;
 
   case 105:
-#line 1229 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1229 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
     break;
 
   case 106:
-#line 1230 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1230 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
     break;
 
   case 107:
-#line 1231 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1231 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
     break;
 
   case 108:
-#line 1232 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1232 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
     break;
 
   case 109:
-#line 1233 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1233 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::InReg;     ;}
     break;
 
   case 110:
-#line 1234 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1234 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::StructRet; ;}
     break;
 
   case 111:
-#line 1235 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1235 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoAlias;   ;}
     break;
 
   case 112:
-#line 1236 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1236 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ByVal;     ;}
     break;
 
   case 113:
-#line 1237 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1237 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::Nest;      ;}
     break;
 
   case 114:
-#line 1238 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1238 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = 
                           ParamAttr::constructAlignmentFromInt((yyvsp[(2) - (2)].UInt64Val));    ;}
     break;
 
   case 115:
-#line 1242 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1242 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::None; ;}
     break;
 
   case 116:
-#line 1243 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1243 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
               ;}
     break;
 
   case 117:
-#line 1248 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1248 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoReturn; ;}
     break;
 
   case 118:
-#line 1249 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1249 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoUnwind; ;}
     break;
 
   case 119:
-#line 1250 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1250 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ZExt;     ;}
     break;
 
   case 120:
-#line 1251 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1251 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::SExt;     ;}
     break;
 
   case 121:
-#line 1252 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1252 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ReadNone; ;}
     break;
 
   case 122:
-#line 1253 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1253 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ReadOnly; ;}
     break;
 
   case 123:
-#line 1256 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1256 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::None; ;}
     break;
 
   case 124:
-#line 1257 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1257 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
               ;}
     break;
 
   case 125:
-#line 1262 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1262 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 126:
-#line 1263 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1263 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal);
               ;}
     break;
 
   case 127:
-#line 1270 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1270 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 128:
-#line 1271 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1271 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3938,12 +3938,12 @@ yyreduce:
     break;
 
   case 129:
-#line 1277 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1277 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 130:
-#line 1278 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1278 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3953,7 +3953,7 @@ yyreduce:
     break;
 
   case 131:
-#line 1287 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1287 "/Volumes/Nanpura/mrv/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] == '\\')
@@ -3964,27 +3964,27 @@ yyreduce:
     break;
 
   case 132:
-#line 1295 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1295 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 133:
-#line 1296 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1296 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;}
     break;
 
   case 134:
-#line 1301 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1301 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 135:
-#line 1302 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1302 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 136:
-#line 1303 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1303 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV->setSection(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -3993,7 +3993,7 @@ yyreduce:
     break;
 
   case 137:
-#line 1308 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1308 "/Volumes/Nanpura/mrv/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");
@@ -4003,7 +4003,7 @@ yyreduce:
     break;
 
   case 145:
-#line 1324 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1324 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
@@ -4011,7 +4011,7 @@ yyreduce:
     break;
 
   case 146:
-#line 1328 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1328 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder((yyvsp[(1) - (1)].PrimType));
     CHECK_FOR_ERROR
@@ -4019,7 +4019,7 @@ yyreduce:
     break;
 
   case 147:
-#line 1332 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1332 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {                             // Pointer type?
     if (*(yyvsp[(1) - (3)].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
@@ -4030,7 +4030,7 @@ yyreduce:
     break;
 
   case 148:
-#line 1339 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1339 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {            // Named types are also simple types...
     const Type* tmp = getTypeVal((yyvsp[(1) - (1)].ValIDVal));
     CHECK_FOR_ERROR
@@ -4039,7 +4039,7 @@ yyreduce:
     break;
 
   case 149:
-#line 1344 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1344 "/Volumes/Nanpura/mrv/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
@@ -4051,7 +4051,7 @@ yyreduce:
     break;
 
   case 150:
-#line 1352 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1352 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4085,7 +4085,7 @@ yyreduce:
     break;
 
   case 151:
-#line 1382 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1382 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4113,7 +4113,7 @@ yyreduce:
     break;
 
   case 152:
-#line 1407 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1407 "/Volumes/Nanpura/mrv/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);
@@ -4122,7 +4122,7 @@ yyreduce:
     break;
 
   case 153:
-#line 1412 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1412 "/Volumes/Nanpura/mrv/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))
@@ -4136,7 +4136,7 @@ yyreduce:
     break;
 
   case 154:
-#line 1422 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1422 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(),
@@ -4150,7 +4150,7 @@ yyreduce:
     break;
 
   case 155:
-#line 1432 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1432 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
@@ -4158,7 +4158,7 @@ yyreduce:
     break;
 
   case 156:
-#line 1436 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1436 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(),
@@ -4172,7 +4172,7 @@ yyreduce:
     break;
 
   case 157:
-#line 1446 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1446 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {                         // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
     CHECK_FOR_ERROR
@@ -4180,7 +4180,7 @@ yyreduce:
     break;
 
   case 158:
-#line 1453 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1453 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4190,7 +4190,7 @@ yyreduce:
     break;
 
   case 159:
-#line 1462 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1462 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal))->getDescription());
@@ -4201,14 +4201,14 @@ yyreduce:
     break;
 
   case 160:
-#line 1469 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1469 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
   ;}
     break;
 
   case 161:
-#line 1474 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1474 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     (yyval.TypeWithAttrsList)->push_back((yyvsp[(1) - (1)].TypeWithAttrs));
@@ -4217,7 +4217,7 @@ yyreduce:
     break;
 
   case 162:
-#line 1479 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1479 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList))->push_back((yyvsp[(3) - (3)].TypeWithAttrs));
     CHECK_FOR_ERROR
@@ -4225,7 +4225,7 @@ yyreduce:
     break;
 
   case 164:
-#line 1487 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1487 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList);
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
@@ -4236,7 +4236,7 @@ yyreduce:
     break;
 
   case 165:
-#line 1494 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1494 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
@@ -4247,7 +4247,7 @@ yyreduce:
     break;
 
   case 166:
-#line 1501 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1501 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
@@ -4255,7 +4255,7 @@ yyreduce:
     break;
 
   case 167:
-#line 1509 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1509 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     (yyval.TypeList)->push_back(*(yyvsp[(1) - (1)].TypeVal)); 
@@ -4265,7 +4265,7 @@ yyreduce:
     break;
 
   case 168:
-#line 1515 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1515 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(*(yyvsp[(3) - (3)].TypeVal)); 
     delete (yyvsp[(3) - (3)].TypeVal);
@@ -4274,7 +4274,7 @@ yyreduce:
     break;
 
   case 169:
-#line 1527 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1527 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
@@ -4306,7 +4306,7 @@ yyreduce:
     break;
 
   case 170:
-#line 1555 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1555 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4326,7 +4326,7 @@ yyreduce:
     break;
 
   case 171:
-#line 1571 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1571 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4357,7 +4357,7 @@ yyreduce:
     break;
 
   case 172:
-#line 1598 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1598 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
@@ -4389,7 +4389,7 @@ yyreduce:
     break;
 
   case 173:
-#line 1626 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1626 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (STy == 0)
@@ -4419,7 +4419,7 @@ yyreduce:
     break;
 
   case 174:
-#line 1652 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1652 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4443,7 +4443,7 @@ yyreduce:
     break;
 
   case 175:
-#line 1672 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1672 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (6)].TypeVal)->get());
     if (STy == 0)
@@ -4473,7 +4473,7 @@ yyreduce:
     break;
 
   case 176:
-#line 1698 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1698 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (5)].TypeVal))->getDescription());
@@ -4497,7 +4497,7 @@ yyreduce:
     break;
 
   case 177:
-#line 1718 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1718 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4513,7 +4513,7 @@ yyreduce:
     break;
 
   case 178:
-#line 1730 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1730 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4524,7 +4524,7 @@ yyreduce:
     break;
 
   case 179:
-#line 1737 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1737 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4594,7 +4594,7 @@ yyreduce:
     break;
 
   case 180:
-#line 1803 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1803 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4608,7 +4608,7 @@ yyreduce:
     break;
 
   case 181:
-#line 1813 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1813 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4622,7 +4622,7 @@ yyreduce:
     break;
 
   case 182:
-#line 1823 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1823 "/Volumes/Nanpura/mrv/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");
@@ -4632,7 +4632,7 @@ yyreduce:
     break;
 
   case 183:
-#line 1829 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1829 "/Volumes/Nanpura/mrv/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) {
@@ -4646,7 +4646,7 @@ yyreduce:
     break;
 
   case 184:
-#line 1839 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1839 "/Volumes/Nanpura/mrv/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");
@@ -4656,7 +4656,7 @@ yyreduce:
     break;
 
   case 185:
-#line 1845 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1845 "/Volumes/Nanpura/mrv/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) {
@@ -4670,7 +4670,7 @@ yyreduce:
     break;
 
   case 186:
-#line 1855 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1855 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
     assert(cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() == 1 && "Not Bool?");
     (yyval.ConstVal) = ConstantInt::getTrue();
@@ -4679,7 +4679,7 @@ yyreduce:
     break;
 
   case 187:
-#line 1860 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1860 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
     assert(cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() == 1 && "Not Bool?");
     (yyval.ConstVal) = ConstantInt::getFalse();
@@ -4688,7 +4688,7 @@ yyreduce:
     break;
 
   case 188:
-#line 1865 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1865 "/Volumes/Nanpura/mrv/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");
@@ -4703,7 +4703,7 @@ yyreduce:
     break;
 
   case 189:
-#line 1878 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1878 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (6)].TypeVal))->getDescription());
@@ -4719,7 +4719,7 @@ yyreduce:
     break;
 
   case 190:
-#line 1890 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1890 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand");
@@ -4745,7 +4745,7 @@ yyreduce:
     break;
 
   case 191:
-#line 1912 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1912 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (8)].ConstVal)->getType() != Type::Int1Ty)
       GEN_ERROR("Select condition must be of boolean type");
@@ -4757,7 +4757,7 @@ yyreduce:
     break;
 
   case 192:
-#line 1920 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1920 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match");
@@ -4767,7 +4767,7 @@ yyreduce:
     break;
 
   case 193:
-#line 1926 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1926 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match");
@@ -4782,7 +4782,7 @@ yyreduce:
     break;
 
   case 194:
-#line 1937 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1937 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match");
@@ -4791,7 +4791,7 @@ yyreduce:
     break;
 
   case 195:
-#line 1942 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1942 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match");
@@ -4800,7 +4800,7 @@ yyreduce:
     break;
 
   case 196:
-#line 1947 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1947 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -4810,7 +4810,7 @@ yyreduce:
     break;
 
   case 197:
-#line 1953 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1953 "/Volumes/Nanpura/mrv/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");
@@ -4820,7 +4820,7 @@ yyreduce:
     break;
 
   case 198:
-#line 1959 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1959 "/Volumes/Nanpura/mrv/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");
@@ -4830,7 +4830,7 @@ yyreduce:
     break;
 
   case 199:
-#line 1968 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1968 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal));
     CHECK_FOR_ERROR
@@ -4838,7 +4838,7 @@ yyreduce:
     break;
 
   case 200:
-#line 1972 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1972 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal));
@@ -4847,27 +4847,27 @@ yyreduce:
     break;
 
   case 201:
-#line 1980 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1980 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 202:
-#line 1980 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1980 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 203:
-#line 1983 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1983 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 204:
-#line 1983 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1983 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 205:
-#line 1986 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1986 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const Type* VTy = (yyvsp[(1) - (2)].TypeVal)->get();
     Value *V = getVal(VTy, (yyvsp[(2) - (2)].ValIDVal));
@@ -4883,7 +4883,7 @@ yyreduce:
     break;
 
   case 206:
-#line 1998 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1998 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Constant *Val = (yyvsp[(3) - (6)].ConstVal);
     const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get();
@@ -4899,7 +4899,7 @@ yyreduce:
     break;
 
   case 207:
-#line 2019 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2019 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -4908,7 +4908,7 @@ yyreduce:
     break;
 
   case 208:
-#line 2024 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2024 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -4917,12 +4917,12 @@ yyreduce:
     break;
 
   case 211:
-#line 2037 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2037 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = false; ;}
     break;
 
   case 212:
-#line 2037 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2037 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
@@ -4930,26 +4930,26 @@ yyreduce:
     break;
 
   case 213:
-#line 2041 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2041 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
   case 214:
-#line 2041 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2041 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 215:
-#line 2044 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2044 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 216:
-#line 2047 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2047 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (3)].TypeVal))->getDescription());
@@ -4977,7 +4977,7 @@ yyreduce:
     break;
 
   case 217:
-#line 2071 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2071 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ResolveTypeTo((yyvsp[(1) - (3)].StrVal), (yyvsp[(3) - (3)].PrimType));
 
@@ -4992,7 +4992,7 @@ yyreduce:
     break;
 
   case 218:
-#line 2083 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2083 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
     /* "Externally Visible" Linkage */
     if ((yyvsp[(5) - (6)].ConstVal) == 0) 
@@ -5004,14 +5004,14 @@ yyreduce:
     break;
 
   case 219:
-#line 2090 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2090 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 220:
-#line 2094 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2094 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(6) - (7)].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant");
@@ -5021,14 +5021,14 @@ yyreduce:
     break;
 
   case 221:
-#line 2099 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2099 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 222:
-#line 2103 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2103 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(6) - (7)].TypeVal))->getDescription());
@@ -5039,7 +5039,7 @@ yyreduce:
     break;
 
   case 223:
-#line 2109 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2109 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
@@ -5047,7 +5047,7 @@ yyreduce:
     break;
 
   case 224:
-#line 2113 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2113 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::string Name;
     if ((yyvsp[(1) - (5)].StrVal)) {
@@ -5091,21 +5091,21 @@ yyreduce:
     break;
 
   case 225:
-#line 2153 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2153 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 226:
-#line 2156 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2156 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 227:
-#line 2162 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2162 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   if (AsmSoFar.empty())
@@ -5118,7 +5118,7 @@ yyreduce:
     break;
 
   case 228:
-#line 2172 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2172 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
@@ -5126,7 +5126,7 @@ yyreduce:
     break;
 
   case 229:
-#line 2176 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2176 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
@@ -5134,7 +5134,7 @@ yyreduce:
     break;
 
   case 231:
-#line 2183 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2183 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(3) - (3)].StrVal));
           delete (yyvsp[(3) - (3)].StrVal);
@@ -5143,7 +5143,7 @@ yyreduce:
     break;
 
   case 232:
-#line 2188 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2188 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(1) - (1)].StrVal));
           delete (yyvsp[(1) - (1)].StrVal);
@@ -5152,14 +5152,14 @@ yyreduce:
     break;
 
   case 233:
-#line 2193 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2193 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
   case 234:
-#line 2202 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2202 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -5173,7 +5173,7 @@ yyreduce:
     break;
 
   case 235:
-#line 2212 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2212 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -5187,7 +5187,7 @@ yyreduce:
     break;
 
   case 236:
-#line 2223 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2223 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList);
     CHECK_FOR_ERROR
@@ -5195,7 +5195,7 @@ yyreduce:
     break;
 
   case 237:
-#line 2227 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2227 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList);
     struct ArgListEntry E;
@@ -5208,7 +5208,7 @@ yyreduce:
     break;
 
   case 238:
-#line 2236 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2236 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
@@ -5221,7 +5221,7 @@ yyreduce:
     break;
 
   case 239:
-#line 2245 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2245 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
@@ -5229,7 +5229,7 @@ yyreduce:
     break;
 
   case 240:
-#line 2251 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2251 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   std::string FunctionName(*(yyvsp[(3) - (10)].StrVal));
   delete (yyvsp[(3) - (10)].StrVal);  // Free strdup'd memory!
@@ -5365,7 +5365,7 @@ yyreduce:
     break;
 
   case 243:
-#line 2386 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2386 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -5377,7 +5377,7 @@ yyreduce:
     break;
 
   case 246:
-#line 2397 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2397 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
   CHECK_FOR_ERROR
@@ -5385,7 +5385,7 @@ yyreduce:
     break;
 
   case 247:
-#line 2402 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2402 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.CurrentFunction->setLinkage((yyvsp[(1) - (3)].Linkage));
     CurFun.CurrentFunction->setVisibility((yyvsp[(2) - (3)].Visibility));
@@ -5396,7 +5396,7 @@ yyreduce:
     break;
 
   case 248:
-#line 2414 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2414 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -5404,7 +5404,7 @@ yyreduce:
     break;
 
   case 249:
-#line 2418 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2418 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -5412,7 +5412,7 @@ yyreduce:
     break;
 
   case 250:
-#line 2423 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2423 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val));
     CHECK_FOR_ERROR
@@ -5420,7 +5420,7 @@ yyreduce:
     break;
 
   case 251:
-#line 2427 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2427 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val));
     CHECK_FOR_ERROR
@@ -5428,7 +5428,7 @@ yyreduce:
     break;
 
   case 252:
-#line 2431 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2431 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal));
     CHECK_FOR_ERROR
@@ -5436,7 +5436,7 @@ yyreduce:
     break;
 
   case 253:
-#line 2435 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2435 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
@@ -5444,7 +5444,7 @@ yyreduce:
     break;
 
   case 254:
-#line 2439 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2439 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
@@ -5452,7 +5452,7 @@ yyreduce:
     break;
 
   case 255:
-#line 2443 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2443 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
@@ -5460,7 +5460,7 @@ yyreduce:
     break;
 
   case 256:
-#line 2447 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2447 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
@@ -5468,7 +5468,7 @@ yyreduce:
     break;
 
   case 257:
-#line 2451 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2451 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
@@ -5476,7 +5476,7 @@ yyreduce:
     break;
 
   case 258:
-#line 2455 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2455 "/Volumes/Nanpura/mrv/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(); 
@@ -5505,7 +5505,7 @@ yyreduce:
     break;
 
   case 259:
-#line 2480 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2480 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal));
     CHECK_FOR_ERROR
@@ -5513,7 +5513,7 @@ yyreduce:
     break;
 
   case 260:
-#line 2484 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2484 "/Volumes/Nanpura/mrv/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);
@@ -5523,7 +5523,7 @@ yyreduce:
     break;
 
   case 261:
-#line 2494 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2494 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::createLocalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
@@ -5531,7 +5531,7 @@ yyreduce:
     break;
 
   case 262:
-#line 2498 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2498 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
@@ -5539,7 +5539,7 @@ yyreduce:
     break;
 
   case 263:
-#line 2502 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2502 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -5548,7 +5548,7 @@ yyreduce:
     break;
 
   case 264:
-#line 2507 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2507 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createGlobalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -5557,7 +5557,7 @@ yyreduce:
     break;
 
   case 267:
-#line 2520 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2520 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -5568,7 +5568,7 @@ yyreduce:
     break;
 
   case 268:
-#line 2529 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2529 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = new std::vector<Value *>();
     (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal)); 
@@ -5577,7 +5577,7 @@ yyreduce:
     break;
 
   case 269:
-#line 2534 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2534 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ValueList)=(yyvsp[(1) - (3)].ValueList))->push_back((yyvsp[(3) - (3)].ValueVal)); 
     CHECK_FOR_ERROR
@@ -5585,7 +5585,7 @@ yyreduce:
     break;
 
   case 270:
-#line 2539 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2539 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
@@ -5593,7 +5593,7 @@ yyreduce:
     break;
 
   case 271:
-#line 2543 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2543 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks   
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
@@ -5601,7 +5601,7 @@ yyreduce:
     break;
 
   case 272:
-#line 2552 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2552 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[(3) - (3)].TermInstVal), (yyvsp[(2) - (3)].StrVal));
     CHECK_FOR_ERROR
@@ -5613,7 +5613,7 @@ yyreduce:
     break;
 
   case 273:
-#line 2561 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2561 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[(2) - (2)].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
@@ -5626,7 +5626,7 @@ yyreduce:
     break;
 
   case 274:
-#line 2570 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2570 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Empty space between instruction lists
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     CHECK_FOR_ERROR
@@ -5634,7 +5634,7 @@ yyreduce:
     break;
 
   case 275:
-#line 2574 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2574 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {             // Labelled (named) basic block
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal)));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -5644,18 +5644,18 @@ yyreduce:
     break;
 
   case 276:
-#line 2582 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2582 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Return with a result...
     ValueList &VL = *(yyvsp[(2) - (2)].ValueList);
-    if (!VL.empty())
-      (yyval.TermInstVal) = new ReturnInst(&VL[0], VL.size());
+    assert(!VL.empty() && "Invalid ret operands!");
+    (yyval.TermInstVal) = new ReturnInst(&VL[0], VL.size());
     delete (yyvsp[(2) - (2)].ValueList);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 277:
-#line 2589 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2589 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {                                    // Return with no result...
     (yyval.TermInstVal) = new ReturnInst();
     CHECK_FOR_ERROR
@@ -5663,7 +5663,7 @@ yyreduce:
     break;
 
   case 278:
-#line 2593 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2593 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {                           // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal));
     CHECK_FOR_ERROR
@@ -5672,7 +5672,7 @@ yyreduce:
     break;
 
   case 279:
-#line 2598 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2598 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {  
     assert(cast<IntegerType>((yyvsp[(2) - (9)].PrimType))->getBitWidth() == 1 && "Not Bool?");
     BasicBlock* tmpBBA = getBBVal((yyvsp[(6) - (9)].ValIDVal));
@@ -5686,7 +5686,7 @@ yyreduce:
     break;
 
   case 280:
-#line 2608 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2608 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType), (yyvsp[(3) - (9)].ValIDVal));
     CHECK_FOR_ERROR
@@ -5709,7 +5709,7 @@ yyreduce:
     break;
 
   case 281:
-#line 2627 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2627 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType), (yyvsp[(3) - (8)].ValIDVal));
     CHECK_FOR_ERROR
@@ -5722,7 +5722,7 @@ yyreduce:
     break;
 
   case 282:
-#line 2637 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2637 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -5816,7 +5816,7 @@ yyreduce:
     break;
 
   case 283:
-#line 2727 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2727 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
@@ -5824,7 +5824,7 @@ yyreduce:
     break;
 
   case 284:
-#line 2731 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2731 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
@@ -5832,7 +5832,7 @@ yyreduce:
     break;
 
   case 285:
-#line 2738 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2738 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable);
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal)));
@@ -5847,7 +5847,7 @@ yyreduce:
     break;
 
   case 286:
-#line 2749 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2749 "/Volumes/Nanpura/mrv/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)));
@@ -5863,7 +5863,7 @@ yyreduce:
     break;
 
   case 287:
-#line 2762 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2762 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Is this definition named?? if so, assign the name...
     setValueName((yyvsp[(2) - (2)].InstVal), (yyvsp[(1) - (2)].StrVal));
@@ -5875,7 +5875,7 @@ yyreduce:
     break;
 
   case 288:
-#line 2772 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2772 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (6)].TypeVal))->getDescription());
@@ -5890,7 +5890,7 @@ yyreduce:
     break;
 
   case 289:
-#line 2783 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2783 "/Volumes/Nanpura/mrv/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));
@@ -5902,7 +5902,7 @@ yyreduce:
     break;
 
   case 290:
-#line 2793 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2793 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
@@ -5917,7 +5917,7 @@ yyreduce:
     break;
 
   case 291:
-#line 2804 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2804 "/Volumes/Nanpura/mrv/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
@@ -5929,7 +5929,7 @@ yyreduce:
     break;
 
   case 292:
-#line 2812 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2812 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
@@ -5943,7 +5943,7 @@ yyreduce:
     break;
 
   case 293:
-#line 2822 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2822 "/Volumes/Nanpura/mrv/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);
@@ -5954,17 +5954,17 @@ yyreduce:
     break;
 
   case 294:
-#line 2829 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2829 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamList) = new ParamList(); ;}
     break;
 
   case 295:
-#line 2832 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2832 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = new std::vector<Value*>(); ;}
     break;
 
   case 296:
-#line 2833 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2833 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList);
     (yyval.ValueList)->push_back((yyvsp[(3) - (3)].ValueVal));
@@ -5973,7 +5973,7 @@ yyreduce:
     break;
 
   case 297:
-#line 2840 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2840 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -5981,7 +5981,7 @@ yyreduce:
     break;
 
   case 298:
-#line 2844 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2844 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -5989,7 +5989,7 @@ yyreduce:
     break;
 
   case 299:
-#line 2849 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2849 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6009,7 +6009,7 @@ yyreduce:
     break;
 
   case 300:
-#line 2865 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2865 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6030,7 +6030,7 @@ yyreduce:
     break;
 
   case 301:
-#line 2882 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2882 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6048,7 +6048,7 @@ yyreduce:
     break;
 
   case 302:
-#line 2896 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2896 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6066,7 +6066,7 @@ yyreduce:
     break;
 
   case 303:
-#line 2910 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2910 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6082,7 +6082,7 @@ yyreduce:
     break;
 
   case 304:
-#line 2922 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2922 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(2) - (6)].ValueVal)->getType() != Type::Int1Ty)
       GEN_ERROR("select condition must be boolean");
@@ -6094,7 +6094,7 @@ yyreduce:
     break;
 
   case 305:
-#line 2930 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2930 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6105,7 +6105,7 @@ yyreduce:
     break;
 
   case 306:
-#line 2937 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2937 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -6115,7 +6115,7 @@ yyreduce:
     break;
 
   case 307:
-#line 2943 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2943 "/Volumes/Nanpura/mrv/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");
@@ -6125,7 +6125,7 @@ yyreduce:
     break;
 
   case 308:
-#line 2949 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2949 "/Volumes/Nanpura/mrv/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");
@@ -6135,7 +6135,7 @@ yyreduce:
     break;
 
   case 309:
-#line 2955 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2955 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[(2) - (2)].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -6154,7 +6154,7 @@ yyreduce:
     break;
 
   case 310:
-#line 2971 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2971 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -6255,7 +6255,7 @@ yyreduce:
     break;
 
   case 311:
-#line 3068 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3068 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal);
     CHECK_FOR_ERROR
@@ -6263,7 +6263,7 @@ yyreduce:
     break;
 
   case 312:
-#line 3073 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3073 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -6271,7 +6271,7 @@ yyreduce:
     break;
 
   case 313:
-#line 3077 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3077 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -6279,7 +6279,7 @@ yyreduce:
     break;
 
   case 314:
-#line 3084 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3084 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6290,7 +6290,7 @@ yyreduce:
     break;
 
   case 315:
-#line 3091 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3091 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6302,7 +6302,7 @@ yyreduce:
     break;
 
   case 316:
-#line 3099 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3099 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6313,7 +6313,7 @@ yyreduce:
     break;
 
   case 317:
-#line 3106 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3106 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6325,7 +6325,7 @@ yyreduce:
     break;
 
   case 318:
-#line 3114 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3114 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(2) - (2)].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
@@ -6336,7 +6336,7 @@ yyreduce:
     break;
 
   case 319:
-#line 3122 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3122 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -6354,7 +6354,7 @@ yyreduce:
     break;
 
   case 320:
-#line 3136 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3136 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (7)].TypeVal))->getDescription());
@@ -6375,7 +6375,7 @@ yyreduce:
     break;
 
   case 321:
-#line 3153 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3153 "/Volumes/Nanpura/mrv/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)))
@@ -6387,7 +6387,7 @@ yyreduce:
     break;
 
   case 322:
-#line 3161 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3161 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
@@ -6621,7 +6621,7 @@ yyreturn:
 }
 
 
-#line 3178 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3178 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions
diff --git a/lib/AsmParser/llvmAsmParser.h.cvs b/lib/AsmParser/llvmAsmParser.h.cvs
index 9286343a4a2..d115a121ee1 100644
--- a/lib/AsmParser/llvmAsmParser.h.cvs
+++ b/lib/AsmParser/llvmAsmParser.h.cvs
@@ -344,7 +344,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 953 "/Volumes/Nanpura/w/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 953 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
diff --git a/lib/AsmParser/llvmAsmParser.y.cvs b/lib/AsmParser/llvmAsmParser.y.cvs
index b7b40090e83..5a824ae8fe4 100644
--- a/lib/AsmParser/llvmAsmParser.y.cvs
+++ b/lib/AsmParser/llvmAsmParser.y.cvs
@@ -2581,8 +2581,8 @@ InstructionList : InstructionList Inst {
 BBTerminatorInst : 
   RET ReturnedVal  { // Return with a result...
     ValueList &VL = *$2;
-    if (!VL.empty())
-      $$ = new ReturnInst(&VL[0], VL.size());
+    assert(!VL.empty() && "Invalid ret operands!");
+    $$ = new ReturnInst(&VL[0], VL.size());
     delete $2;
     CHECK_FOR_ERROR
   }