diff options
author | Reid Spencer <rspencer@reidspencer.com> | 2007-01-29 19:08:46 +0000 |
---|---|---|
committer | Reid Spencer <rspencer@reidspencer.com> | 2007-01-29 19:08:46 +0000 |
commit | 7de2e013db45cd610aa0864170df95b1c06e0851 (patch) | |
tree | 8634538bc4e58e76eb9d5b364f07fa11a49487e2 | |
parent | f049c6712d77be98c9b448cf8b696b7bfffee85f (diff) |
Regenerate.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33624 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | tools/llvm-upgrade/UpgradeParser.cpp.cvs | 569 | ||||
-rw-r--r-- | tools/llvm-upgrade/UpgradeParser.h.cvs | 2 | ||||
-rw-r--r-- | tools/llvm-upgrade/UpgradeParser.y.cvs | 43 |
3 files changed, 342 insertions, 272 deletions
diff --git a/tools/llvm-upgrade/UpgradeParser.cpp.cvs b/tools/llvm-upgrade/UpgradeParser.cpp.cvs index d1895a91b2..3ac45504cb 100644 --- a/tools/llvm-upgrade/UpgradeParser.cpp.cvs +++ b/tools/llvm-upgrade/UpgradeParser.cpp.cvs @@ -865,6 +865,25 @@ static BasicBlock *getBBVal(const ValID &ID, bool isDefinition = false) { // and back patchs after we are done. // +/// This function determines if two function types differ only in their use of +/// the sret parameter attribute in the first argument. If they are identical +/// in all other respects, it returns true. Otherwise, it returns false. +bool FuncTysDifferOnlyBySRet(const FunctionType *F1, + const FunctionType *F2) { + if (F1->getReturnType() != F2->getReturnType() || + F1->getNumParams() != F2->getNumParams() || + F1->getParamAttrs(0) != F2->getParamAttrs(0)) + return false; + unsigned SRetMask = ~unsigned(FunctionType::StructRetAttribute); + for (unsigned i = 0; i < F1->getNumParams(); ++i) { + if (F1->getParamType(i) != F2->getParamType(i) || + unsigned(F1->getParamAttrs(i+1)) & SRetMask != + unsigned(F2->getParamAttrs(i+1)) & SRetMask) + return false; + } + return true; +} + // ResolveDefinitions - If we could not resolve some defs at parsing // time (forward branches, phi functions for loops, etc...) resolve the // defs now... @@ -897,10 +916,26 @@ ResolveDefinitions(std::map<const Type*,ValueList> &LateResolvers, InsertValue(V, *FutureLateResolvers); } else { if (DID.Type == ValID::NameVal) { - error("Reference to an invalid definition: '" +DID.getName()+ - "' of type '" + V->getType()->getDescription() + "'", - PHI->second.second); - return; + // The upgrade of csretcc to sret param attribute may have caused a + // function to not be found because the param attribute changed the + // type of the called function. Detect this situation and insert a + // cast as necessary. + bool fixed = false; + if (const PointerType *PTy = dyn_cast<PointerType>(V->getType())) + if (const FunctionType *FTy = + dyn_cast<FunctionType>(PTy->getElementType())) + if (Function *OtherF = + CurModule.CurrentModule->getNamedFunction(DID.getName())) + if (FuncTysDifferOnlyBySRet(FTy,OtherF->getFunctionType())) { + V->replaceAllUsesWith(ConstantExpr::getBitCast(OtherF, PTy)); + fixed = true; + } + if (!fixed) { + error("Reference to an invalid definition: '" +DID.getName()+ + "' of type '" + V->getType()->getDescription() + "'", + PHI->second.second); + return; + } } else { error("Reference to an invalid definition: #" + itostr(DID.Num) + " of type '" + @@ -1781,7 +1816,7 @@ using namespace llvm; #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 1405 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1440 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" typedef union YYSTYPE { llvm::Module *ModuleVal; llvm::Function *FunctionVal; @@ -1824,7 +1859,7 @@ typedef union YYSTYPE { llvm::Module::Endianness Endianness; } YYSTYPE; /* Line 196 of yacc.c. */ -#line 1828 "UpgradeParser.tab.c" +#line 1863 "UpgradeParser.tab.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -1836,7 +1871,7 @@ typedef union YYSTYPE { /* Line 219 of yacc.c. */ -#line 1840 "UpgradeParser.tab.c" +#line 1875 "UpgradeParser.tab.c" #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) # define YYSIZE_T __SIZE_TYPE__ @@ -2194,37 +2229,37 @@ static const short int yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned short int yyrline[] = { - 0, 1545, 1545, 1546, 1554, 1555, 1565, 1565, 1565, 1565, - 1565, 1565, 1565, 1565, 1565, 1565, 1565, 1569, 1569, 1569, - 1573, 1573, 1573, 1573, 1573, 1573, 1577, 1577, 1578, 1578, - 1579, 1579, 1580, 1580, 1581, 1581, 1585, 1585, 1586, 1586, - 1587, 1587, 1588, 1588, 1589, 1589, 1590, 1590, 1591, 1591, - 1592, 1593, 1596, 1596, 1596, 1596, 1600, 1600, 1600, 1600, - 1600, 1600, 1600, 1601, 1601, 1601, 1601, 1601, 1601, 1607, - 1607, 1607, 1607, 1611, 1611, 1611, 1611, 1615, 1615, 1619, - 1619, 1624, 1627, 1632, 1633, 1634, 1635, 1636, 1637, 1638, - 1639, 1643, 1644, 1645, 1646, 1647, 1648, 1649, 1650, 1660, - 1661, 1669, 1670, 1678, 1687, 1688, 1695, 1696, 1700, 1704, - 1720, 1721, 1728, 1729, 1736, 1744, 1744, 1744, 1744, 1744, - 1744, 1744, 1745, 1745, 1745, 1745, 1745, 1750, 1754, 1758, - 1763, 1772, 1793, 1799, 1812, 1821, 1825, 1836, 1840, 1853, - 1857, 1864, 1865, 1871, 1878, 1890, 1920, 1933, 1956, 1984, - 2006, 2017, 2039, 2050, 2059, 2064, 2122, 2129, 2137, 2144, - 2151, 2155, 2159, 2168, 2183, 2196, 2205, 2233, 2246, 2255, - 2261, 2267, 2276, 2282, 2288, 2299, 2300, 2309, 2310, 2322, - 2331, 2332, 2333, 2334, 2335, 2351, 2371, 2373, 2375, 2375, - 2382, 2382, 2389, 2389, 2396, 2396, 2404, 2406, 2408, 2413, - 2427, 2428, 2432, 2435, 2443, 2447, 2454, 2458, 2462, 2466, - 2474, 2474, 2478, 2479, 2483, 2491, 2496, 2504, 2505, 2512, - 2519, 2523, 2638, 2638, 2642, 2652, 2652, 2656, 2660, 2662, - 2663, 2667, 2667, 2679, 2680, 2685, 2686, 2687, 2688, 2689, - 2690, 2691, 2692, 2693, 2714, 2717, 2732, 2733, 2738, 2738, - 2746, 2755, 2758, 2767, 2777, 2782, 2791, 2802, 2802, 2805, - 2808, 2811, 2815, 2821, 2836, 2842, 2898, 2901, 2907, 2917, - 2930, 2959, 2967, 2975, 2979, 2986, 2987, 2991, 2994, 3000, - 3017, 3033, 3047, 3059, 3071, 3082, 3091, 3100, 3109, 3116, - 3137, 3161, 3167, 3173, 3179, 3195, 3273, 3281, 3282, 3286, - 3287, 3291, 3297, 3303, 3309, 3315, 3322, 3334, 3348 + 0, 1580, 1580, 1581, 1589, 1590, 1600, 1600, 1600, 1600, + 1600, 1600, 1600, 1600, 1600, 1600, 1600, 1604, 1604, 1604, + 1608, 1608, 1608, 1608, 1608, 1608, 1612, 1612, 1613, 1613, + 1614, 1614, 1615, 1615, 1616, 1616, 1620, 1620, 1621, 1621, + 1622, 1622, 1623, 1623, 1624, 1624, 1625, 1625, 1626, 1626, + 1627, 1628, 1631, 1631, 1631, 1631, 1635, 1635, 1635, 1635, + 1635, 1635, 1635, 1636, 1636, 1636, 1636, 1636, 1636, 1642, + 1642, 1642, 1642, 1646, 1646, 1646, 1646, 1650, 1650, 1654, + 1654, 1659, 1662, 1667, 1668, 1669, 1670, 1671, 1672, 1673, + 1674, 1678, 1679, 1680, 1681, 1682, 1683, 1684, 1685, 1695, + 1696, 1704, 1705, 1713, 1722, 1723, 1730, 1731, 1735, 1739, + 1755, 1756, 1763, 1764, 1771, 1779, 1779, 1779, 1779, 1779, + 1779, 1779, 1780, 1780, 1780, 1780, 1780, 1785, 1789, 1793, + 1798, 1807, 1828, 1834, 1847, 1856, 1860, 1871, 1875, 1888, + 1892, 1899, 1900, 1906, 1913, 1925, 1955, 1968, 1991, 2019, + 2041, 2052, 2074, 2085, 2094, 2099, 2157, 2164, 2172, 2179, + 2186, 2190, 2194, 2203, 2218, 2231, 2240, 2268, 2281, 2290, + 2296, 2302, 2311, 2317, 2323, 2334, 2335, 2344, 2345, 2357, + 2366, 2367, 2368, 2369, 2370, 2386, 2406, 2408, 2410, 2410, + 2417, 2417, 2424, 2424, 2431, 2431, 2439, 2441, 2443, 2448, + 2462, 2463, 2467, 2470, 2478, 2482, 2489, 2493, 2497, 2501, + 2509, 2509, 2513, 2514, 2518, 2526, 2531, 2539, 2540, 2547, + 2554, 2558, 2673, 2673, 2677, 2687, 2687, 2691, 2695, 2697, + 2698, 2702, 2702, 2714, 2715, 2720, 2721, 2722, 2723, 2724, + 2725, 2726, 2727, 2728, 2749, 2752, 2767, 2768, 2773, 2773, + 2781, 2790, 2793, 2802, 2812, 2817, 2826, 2837, 2837, 2840, + 2843, 2846, 2850, 2856, 2871, 2877, 2933, 2936, 2942, 2952, + 2965, 2994, 3002, 3010, 3014, 3021, 3022, 3026, 3029, 3035, + 3052, 3068, 3082, 3094, 3106, 3117, 3126, 3135, 3144, 3151, + 3172, 3196, 3202, 3208, 3214, 3230, 3308, 3316, 3317, 3321, + 3322, 3326, 3332, 3338, 3344, 3350, 3357, 3369, 3383 }; #endif @@ -3626,7 +3661,7 @@ yyreduce: switch (yyn) { case 3: -#line 1546 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1581 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { if ((yyvsp[0].UIntVal) > (uint32_t)INT32_MAX) // Outside of my range! error("Value too large for type"); @@ -3635,7 +3670,7 @@ yyreduce: break; case 5: -#line 1555 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1590 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { if ((yyvsp[0].UInt64Val) > (uint64_t)INT64_MAX) // Outside of my range! error("Value too large for type"); @@ -3644,226 +3679,226 @@ yyreduce: break; case 26: -#line 1577 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1612 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.IPred) = ICmpInst::ICMP_EQ; ;} break; case 27: -#line 1577 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1612 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.IPred) = ICmpInst::ICMP_NE; ;} break; case 28: -#line 1578 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1613 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.IPred) = ICmpInst::ICMP_SLT; ;} break; case 29: -#line 1578 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1613 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.IPred) = ICmpInst::ICMP_SGT; ;} break; case 30: -#line 1579 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1614 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.IPred) = ICmpInst::ICMP_SLE; ;} break; case 31: -#line 1579 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1614 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.IPred) = ICmpInst::ICMP_SGE; ;} break; case 32: -#line 1580 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1615 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.IPred) = ICmpInst::ICMP_ULT; ;} break; case 33: -#line 1580 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1615 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.IPred) = ICmpInst::ICMP_UGT; ;} break; case 34: -#line 1581 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1616 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.IPred) = ICmpInst::ICMP_ULE; ;} break; case 35: -#line 1581 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1616 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.IPred) = ICmpInst::ICMP_UGE; ;} break; case 36: -#line 1585 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1620 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.FPred) = FCmpInst::FCMP_OEQ; ;} break; case 37: -#line 1585 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1620 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.FPred) = FCmpInst::FCMP_ONE; ;} break; case 38: -#line 1586 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1621 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.FPred) = FCmpInst::FCMP_OLT; ;} break; case 39: -#line 1586 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1621 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.FPred) = FCmpInst::FCMP_OGT; ;} break; case 40: -#line 1587 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1622 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.FPred) = FCmpInst::FCMP_OLE; ;} break; case 41: -#line 1587 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1622 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.FPred) = FCmpInst::FCMP_OGE; ;} break; case 42: -#line 1588 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1623 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.FPred) = FCmpInst::FCMP_ORD; ;} break; case 43: -#line 1588 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1623 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.FPred) = FCmpInst::FCMP_UNO; ;} break; case 44: -#line 1589 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1624 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.FPred) = FCmpInst::FCMP_UEQ; ;} break; case 45: -#line 1589 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1624 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.FPred) = FCmpInst::FCMP_UNE; ;} break; case 46: -#line 1590 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1625 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.FPred) = FCmpInst::FCMP_ULT; ;} break; case 47: -#line 1590 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1625 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.FPred) = FCmpInst::FCMP_UGT; ;} break; case 48: -#line 1591 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1626 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.FPred) = FCmpInst::FCMP_ULE; ;} break; case 49: -#line 1591 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1626 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.FPred) = FCmpInst::FCMP_UGE; ;} break; case 50: -#line 1592 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1627 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.FPred) = FCmpInst::FCMP_TRUE; ;} break; case 51: -#line 1593 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1628 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.FPred) = FCmpInst::FCMP_FALSE; ;} break; case 81: -#line 1624 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1659 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.StrVal) = (yyvsp[-1].StrVal); ;} break; case 82: -#line 1627 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1662 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.StrVal) = 0; ;} break; case 83: -#line 1632 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1667 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Linkage) = GlobalValue::InternalLinkage; ;} break; case 84: -#line 1633 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1668 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;} break; case 85: -#line 1634 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1669 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Linkage) = GlobalValue::WeakLinkage; ;} break; case 86: -#line 1635 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1670 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;} break; case 87: -#line 1636 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1671 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;} break; case 88: -#line 1637 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1672 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;} break; case 89: -#line 1638 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1673 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;} break; case 90: -#line 1639 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1674 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} break; case 91: -#line 1643 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1678 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { CurFun.LastCC = (yyval.UIntVal) = OldCallingConv::C; ;} break; case 92: -#line 1644 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1679 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { CurFun.LastCC = (yyval.UIntVal) = OldCallingConv::C; ;} break; case 93: -#line 1645 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1680 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { CurFun.LastCC = (yyval.UIntVal) = OldCallingConv::CSRet; ;} break; case 94: -#line 1646 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1681 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { CurFun.LastCC = (yyval.UIntVal) = OldCallingConv::Fast; ;} break; case 95: -#line 1647 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1682 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { CurFun.LastCC = (yyval.UIntVal) = OldCallingConv::Cold; ;} break; case 96: -#line 1648 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1683 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { CurFun.LastCC = (yyval.UIntVal) = OldCallingConv::X86_StdCall; ;} break; case 97: -#line 1649 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1684 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { CurFun.LastCC = (yyval.UIntVal) = OldCallingConv::X86_FastCall; ;} break; case 98: -#line 1650 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1685 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { if ((unsigned)(yyvsp[0].UInt64Val) != (yyvsp[0].UInt64Val)) error("Calling conv too large"); @@ -3872,12 +3907,12 @@ yyreduce: break; case 99: -#line 1660 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1695 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.UIntVal) = 0; ;} break; case 100: -#line 1661 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1696 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.UIntVal) = (yyvsp[0].UInt64Val); if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal))) @@ -3886,12 +3921,12 @@ yyreduce: break; case 101: -#line 1669 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1704 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.UIntVal) = 0; ;} break; case 102: -#line 1670 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1705 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.UIntVal) = (yyvsp[0].UInt64Val); if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal))) @@ -3900,7 +3935,7 @@ yyreduce: break; case 103: -#line 1678 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1713 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { for (unsigned i = 0, e = strlen((yyvsp[0].StrVal)); i != e; ++i) if ((yyvsp[0].StrVal)[i] == '"' || (yyvsp[0].StrVal)[i] == '\\') @@ -3910,27 +3945,27 @@ yyreduce: break; case 104: -#line 1687 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1722 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.StrVal) = 0; ;} break; case 105: -#line 1688 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1723 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.StrVal) = (yyvsp[0].StrVal); ;} break; case 106: -#line 1695 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1730 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" {;} break; case 107: -#line 1696 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1731 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" {;} break; case 108: -#line 1700 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1735 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { CurGV->setSection((yyvsp[0].StrVal)); free((yyvsp[0].StrVal)); @@ -3938,7 +3973,7 @@ yyreduce: break; case 109: -#line 1704 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1739 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { if ((yyvsp[0].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[0].UInt64Val))) error("Alignment must be a power of two"); @@ -3948,7 +3983,7 @@ yyreduce: break; case 111: -#line 1721 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1756 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.TypeVal).T = new PATypeHolder((yyvsp[0].PrimType).T); (yyval.TypeVal).S = Signless; @@ -3956,7 +3991,7 @@ yyreduce: break; case 113: -#line 1729 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1764 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.TypeVal).T = new PATypeHolder((yyvsp[0].PrimType).T); (yyval.TypeVal).S = Signless; @@ -3964,7 +3999,7 @@ yyreduce: break; case 114: -#line 1736 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1771 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { if (!UpRefs.empty()) error("Invalid upreference in type: " + (*(yyvsp[0].TypeVal).T)->getDescription()); @@ -3973,7 +4008,7 @@ yyreduce: break; case 127: -#line 1750 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1785 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.TypeVal).T = new PATypeHolder((yyvsp[0].PrimType).T); (yyval.TypeVal).S = (yyvsp[0].PrimType).S; @@ -3981,7 +4016,7 @@ yyreduce: break; case 128: -#line 1754 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1789 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.TypeVal).T = new PATypeHolder(OpaqueType::get()); (yyval.TypeVal).S = Signless; @@ -3989,7 +4024,7 @@ yyreduce: break; case 129: -#line 1758 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1793 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { // Named types are also simple types... const Type* tmp = getType((yyvsp[0].ValIDVal)); (yyval.TypeVal).T = new PATypeHolder(tmp); @@ -3998,7 +4033,7 @@ yyreduce: break; case 130: -#line 1763 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1798 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { // Type UpReference if ((yyvsp[0].UInt64Val) > (uint64_t)~0U) error("Value out of range"); @@ -4011,7 +4046,7 @@ yyreduce: break; case 131: -#line 1772 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1807 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { // Function derived type? std::vector<const Type*> Params; for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp[-1].TypeList)->begin(), @@ -4036,7 +4071,7 @@ yyreduce: break; case 132: -#line 1793 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1828 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { // Sized array type? (yyval.TypeVal).T = new PATypeHolder(HandleUpRefs(ArrayType::get((yyvsp[-1].TypeVal).T->get(), (unsigned)(yyvsp[-3].UInt64Val)))); @@ -4046,7 +4081,7 @@ yyreduce: break; case 133: -#line 1799 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1834 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { // Packed array type? const llvm::Type* ElemTy = (yyvsp[-1].TypeVal).T->get(); if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val)) @@ -4063,7 +4098,7 @@ yyreduce: break; case 134: -#line 1812 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1847 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { // Structure type? std::vector<const Type*> Elements; for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp[-1].TypeList)->begin(), @@ -4076,7 +4111,7 @@ yyreduce: break; case 135: -#line 1821 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1856 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { // Empty structure type? (yyval.TypeVal).T = new PATypeHolder(StructType::get(std::vector<const Type*>())); (yyval.TypeVal).S = Signless; @@ -4084,7 +4119,7 @@ yyreduce: break; case 136: -#line 1825 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1860 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { // Packed Structure type? std::vector<const Type*> Elements; for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp[-2].TypeList)->begin(), @@ -4099,7 +4134,7 @@ yyreduce: break; case 137: -#line 1836 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1871 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { // Empty packed structure type? (yyval.TypeVal).T = new PATypeHolder(StructType::get(std::vector<const Type*>(),true)); (yyval.TypeVal).S = Signless; @@ -4107,7 +4142,7 @@ yyreduce: break; case 138: -#line 1840 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1875 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { // Pointer type? if ((yyvsp[-1].TypeVal).T->get() == Type::LabelTy) error("Cannot form a pointer to a basic block"); @@ -4118,7 +4153,7 @@ yyreduce: break; case 139: -#line 1853 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1888 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.TypeList) = new std::list<PATypeInfo>(); (yyval.TypeList)->push_back((yyvsp[0].TypeVal)); @@ -4126,14 +4161,14 @@ yyreduce: break; case 140: -#line 1857 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1892 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back((yyvsp[0].TypeVal)); ;} break; case 142: -#line 1865 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1900 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { PATypeInfo VoidTI; VoidTI.T = new PATypeHolder(Type::VoidTy); @@ -4143,7 +4178,7 @@ yyreduce: break; case 143: -#line 1871 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1906 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.TypeList) = new std::list<PATypeInfo>(); PATypeInfo VoidTI; @@ -4154,14 +4189,14 @@ yyreduce: break; case 144: -#line 1878 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1913 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.TypeList) = new std::list<PATypeInfo>(); ;} break; case 145: -#line 1890 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1925 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { // Nonempty unsized arr const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-3].TypeVal).T->get()); if (ATy == 0) @@ -4195,7 +4230,7 @@ yyreduce: break; case 146: -#line 1920 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1955 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal).T->get()); if (ATy == 0) @@ -4212,7 +4247,7 @@ yyreduce: break; case 147: -#line 1933 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1968 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal).T->get()); if (ATy == 0) @@ -4239,7 +4274,7 @@ yyreduce: break; case 148: -#line 1956 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1991 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { // Nonempty unsized arr const PackedType *PTy = dyn_cast<PackedType>((yyvsp[-3].TypeVal).T->get()); if (PTy == 0) @@ -4271,7 +4306,7 @@ yyreduce: break; case 149: -#line 1984 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2019 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { const StructType *STy = dyn_cast<StructType>((yyvsp[-3].TypeVal).T->get()); if (STy == 0) @@ -4297,7 +4332,7 @@ yyreduce: break; case 150: -#line 2006 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2041 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { const StructType *STy = dyn_cast<StructType>((yyvsp[-2].TypeVal).T->get()); if (STy == 0) @@ -4312,7 +4347,7 @@ yyreduce: break; case 151: -#line 2017 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2052 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { const StructType *STy = dyn_cast<StructType>((yyvsp[-5].TypeVal).T->get()); if (STy == 0) @@ -4338,7 +4373,7 @@ yyreduce: break; case 152: -#line 2039 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2074 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { const StructType *STy = dyn_cast<StructType>((yyvsp[-4].TypeVal).T->get()); if (STy == 0) @@ -4353,7 +4388,7 @@ yyreduce: break; case 153: -#line 2050 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2085 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal).T->get()); if (PTy == 0) @@ -4366,7 +4401,7 @@ yyreduce: break; case 154: -#line 2059 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2094 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ConstVal).C = UndefValue::get((yyvsp[-1].TypeVal).T->get()); (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S; @@ -4375,7 +4410,7 @@ yyreduce: break; case 155: -#line 2064 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2099 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { const PointerType *Ty = dyn_cast<PointerType>((yyvsp[-1].TypeVal).T->get()); if (Ty == 0) @@ -4437,7 +4472,7 @@ yyreduce: break; case 156: -#line 2122 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2157 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { if ((yyvsp[-1].TypeVal).T->get() != (yyvsp[0].ConstVal).C->getType()) error("Mismatched types for constant expression"); @@ -4448,7 +4483,7 @@ yyreduce: break; case 157: -#line 2129 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2164 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { const Type *Ty = (yyvsp[-1].TypeVal).T->get(); if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty)) @@ -4460,7 +4495,7 @@ yyreduce: break; case 158: -#line 2137 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2172 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { // integral constants const Type *Ty = (yyvsp[-1].PrimType).T; if (!ConstantInt::isValueValidForType(Ty, (yyvsp[0].SInt64Val))) @@ -4471,7 +4506,7 @@ yyreduce: break; case 159: -#line 2144 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2179 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { // integral constants const Type *Ty = (yyvsp[-1].PrimType).T; if (!ConstantInt::isValueValidForType(Ty, (yyvsp[0].UInt64Val))) @@ -4482,7 +4517,7 @@ yyreduce: break; case 160: -#line 2151 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2186 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { // Boolean constants (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, true); (yyval.ConstVal).S = Unsigned; @@ -4490,7 +4525,7 @@ yyreduce: break; case 161: -#line 2155 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2190 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { // Boolean constants (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, false); (yyval.ConstVal).S = Unsigned; @@ -4498,7 +4533,7 @@ yyreduce: break; case 162: -#line 2159 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2194 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { // Float & Double constants if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType).T, (yyvsp[0].FPVal))) error("Floating point constant invalid for type"); @@ -4508,7 +4543,7 @@ yyreduce: break; case 163: -#line 2168 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2203 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { const Type* SrcTy = (yyvsp[-3].ConstVal).C->getType(); const Type* DstTy = (yyvsp[-1].TypeVal).T->get(); @@ -4527,7 +4562,7 @@ yyreduce: break; case 164: -#line 2183 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2218 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { const Type *Ty = (yyvsp[-2].ConstVal).C->getType(); if (!isa<PointerType>(Ty)) @@ -4544,7 +4579,7 @@ yyreduce: break; case 165: -#line 2196 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2231 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-5].ConstVal).C->getType()->isInteger() || cast<IntegerType>((yyvsp[-5].ConstVal).C->getType())->getBitWidth() != 1) @@ -4557,7 +4592,7 @@ yyreduce: break; case 166: -#line 2205 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2240 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { const Type *Ty = (yyvsp[-3].ConstVal).C->getType(); if (Ty != (yyvsp[-1].ConstVal).C->getType()) @@ -4589,7 +4624,7 @@ yyreduce: break; case 167: -#line 2233 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2268 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { const Type* Ty = (yyvsp[-3].ConstVal).C->getType(); if (Ty != (yyvsp[-1].ConstVal).C->getType()) @@ -4606,7 +4641,7 @@ yyreduce: break; case 168: -#line 2246 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2281 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { const Type* Ty = (yyvsp[-3].ConstVal).C->getType(); if (Ty != (yyvsp[-1].ConstVal).C->getType()) @@ -4619,7 +4654,7 @@ yyreduce: break; case 169: -#line 2255 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2290 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { if ((yyvsp[-3].ConstVal).C->getType() != (yyvsp[-1].ConstVal).C->getType()) error("icmp operand types must match"); @@ -4629,7 +4664,7 @@ yyreduce: break; case 170: -#line 2261 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 2296 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" { if ((yyvsp[-3].ConstVal).C->getType() != (yyvsp[-1].Con |