summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--llvm/tools/llvm-upgrade/UpgradeParser.cpp210
-rw-r--r--llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs210
-rw-r--r--llvm/tools/llvm-upgrade/UpgradeParser.y.cvs2
3 files changed, 211 insertions, 211 deletions
diff --git a/llvm/tools/llvm-upgrade/UpgradeParser.cpp b/llvm/tools/llvm-upgrade/UpgradeParser.cpp
index e243074ae66..5a21d7fe368 100644
--- a/llvm/tools/llvm-upgrade/UpgradeParser.cpp
+++ b/llvm/tools/llvm-upgrade/UpgradeParser.cpp
@@ -1043,7 +1043,7 @@ static const short int yyrhs[] =
190, 159, 197, 160, -1, 190, 161, 197, 162, -1,
190, 161, 162, -1, 190, 22, -1, 190, 23, -1,
190, 222, -1, 190, 196, -1, 190, 24, -1, 175,
- 167, -1, 176, 18, -1, 4, 25, -1, 4, 26,
+ 167, -1, 176, 167, -1, 4, 25, -1, 4, 26,
-1, 178, 21, -1, 174, 154, 195, 39, 190, 155,
-1, 127, 154, 195, 237, 155, -1, 129, 154, 195,
152, 195, 152, 195, 155, -1, 168, 154, 195, 152,
@@ -1375,72 +1375,72 @@ static const short int yypact[] =
132, 146, -513, -513, -513, -513, -513, -513, 873, -26,
-513, -18, -513, 47, 19, 23, 39, 67, -513, 77,
132, 873, 81, 81, -513, -513, 81, 81, -513, -513,
- -513, -513, -513, 86, -513, -513, -513, -513, -513, -513,
- -513, -513, -513, -513, -513, -513, -513, -513, -513, 223,
- 225, -9, 506, -513, 133, 91, -513, -513, -111, -513,
+ -513, -513, -513, 89, -513, -513, -513, -513, -513, -513,
+ -513, -513, -513, -513, -513, -513, -513, -513, -513, 227,
+ 229, -9, 506, -513, 133, 95, -513, -513, -111, -513,
-513, -513, -513, -513, -513, -513, -513, -513, 901, 36,
- 148, -513, -513, -513, 1336, -513, -513, -513, 219, 76,
- 229, 222, 224, -513, -513, -513, -513, -513, 933, 933,
- 963, 933, -513, 98, 100, 614, -513, -513, -111, -104,
- 104, 216, -513, 86, 1134, -513, 1134, 1134, -513, -513,
+ 148, -513, -513, -513, 1336, -513, -513, -513, 222, 76,
+ 250, 239, 241, -513, -513, -513, -513, -513, 933, 933,
+ 963, 933, -513, 115, 116, 614, -513, -513, -111, -104,
+ 120, 216, -513, 89, 1134, -513, 1134, 1134, -513, -513,
-513, -513, -513, -513, -513, -513, -513, -513, 1134, -513,
- 933, -513, 206, 111, -513, -513, -513, -513, -513, -513,
+ 933, -513, 218, 111, -513, -513, -513, -513, -513, -513,
-513, -513, -513, -513, -513, -513, -513, -513, -513, -513,
-513, -513, -513, -513, 195, 84, 933, 933, 933, 933,
933, 933, -513, -513, -513, -513, 933, 933, 933, 933,
-513, -513, -513, -513, -513, -513, -513, -513, -513, -513,
-513, -513, -513, 933, 933, 933, 933, 933, 111, -513,
11, -513, -513, -513, -513, -513, -513, -513, -513, -93,
- 115, 115, 121, 166, 250, 169, 251, 191, 253, 193,
- 254, 252, 257, 220, 256, 260, 1045, 115, 115, 933,
- 933, 122, -73, 933, -513, 701, -513, 134, 129, -513,
- -513, -513, -513, -513, -513, -513, -513, 221, 195, 84,
- 136, 137, 138, 140, 150, 963, 154, 156, 158, 167,
- 168, -513, -513, -513, -513, 171, -513, 172, -513, -513,
+ 129, 129, 121, 166, 169, 191, 193, 220, 223, 237,
+ 240, 261, 263, 249, 249, 264, 1045, 129, 129, 933,
+ 933, 126, -73, 933, -513, 701, -513, 138, 136, -513,
+ -513, -513, -513, -513, -513, -513, -513, 228, 195, 84,
+ 140, 150, 154, 156, 158, 963, 167, 168, 170, 171,
+ 172, -513, -513, -513, -513, 175, -513, 176, -513, -513,
873, -513, -513, -513, -513, -513, -513, -513, -513, -513,
-513, 933, -513, -513, -513, -513, -513, -513, -513, -513,
- -513, -513, -513, -513, -513, -513, -513, -513, 933, 173,
- 174, -513, 1134, 164, 175, 176, 177, 178, 179, 182,
- 1134, 1134, 1134, 183, 297, 873, 933, 933, 308, -513,
+ -513, -513, -513, -513, -513, -513, -513, -513, 933, 177,
+ 178, -513, 1134, 164, 179, 182, 183, 184, 186, 188,
+ 1134, 1134, 1134, 189, 284, 873, 933, 933, 312, -513,
-8, -513, -513, -513, -513, -513, -513, -513, -513, -513,
- -513, -513, -513, 741, 963, 673, 310, -513, -513, -513,
- -513, -113, -99, -513, 181, -111, -513, 133, -513, 190,
- 189, 774, -513, -513, 315, 192, 194, 963, 963, 963,
- 963, 963, -513, -58, 963, 963, 963, 963, 963, 332,
- 337, 1134, 1134, 1134, -2, -513, 9, -513, 207, 1134,
- 204, 933, 933, 933, 933, 933, 211, 212, 213, 933,
- 933, 1134, 1134, 214, -513, 338, 349, -513, 115, -513,
+ -513, -513, -513, 741, 963, 673, 314, -513, -513, -513,
+ -513, -113, -99, -513, 185, -111, -513, 133, -513, 194,
+ 192, 774, -513, -513, 318, 198, 205, 963, 963, 963,
+ 963, 963, -513, -58, 963, 963, 963, 963, 963, 345,
+ 348, 1134, 1134, 1134, -2, -513, 9, -513, 212, 1134,
+ 209, 933, 933, 933, 933, 933, 214, 215, 219, 933,
+ 933, 1134, 1134, 221, -513, 338, 352, -513, 129, -513,
-61, -57, -513, -70, -513, -513, -513, -513, -513, -513,
- 833, 333, -513, 231, 963, 963, 207, 235, 236, 237,
- 238, 963, -513, 240, 241, 242, 243, 334, 1134, 1134,
- 227, 244, 245, 1134, 353, 1134, 933, -513, 249, 1134,
- 255, -513, -513, 258, 262, 1134, 1134, 1134, -513, -513,
+ 833, 337, -513, 224, 963, 963, 212, 231, 235, 236,
+ 238, 963, -513, 242, 243, 244, 245, 342, 1134, 1134,
+ 247, 251, 252, 1134, 371, 1134, 933, -513, 253, 1134,
+ 254, -513, -513, 255, 257, 1134, 1134, 1134, -513, -513,
248, -513, 933, -513, -513, -513, -513, -513, -513, -513,
- -513, -513, 317, 346, 263, 264, 265, 963, 963, 963,
- 963, -513, 963, 963, 963, 963, 933, 266, 247, 933,
- 1134, 1134, 267, -513, 267, -513, 269, 1134, 270, 933,
- 933, 933, -513, -513, -513, 933, 1134, 386, -513, -513,
+ -513, -513, 335, 363, 258, 262, 260, 963, 963, 963,
+ 963, -513, 963, 963, 963, 963, 933, 265, 266, 933,
+ 1134, 1134, 267, -513, 267, -513, 268, 1134, 269, 933,
+ 933, 933, -513, -513, -513, 933, 1134, 398, -513, -513,
963, 963, -513, 271, 273, 277, 278, 276, 279, 282,
- 283, 284, 390, 15, 269, 286, -513, -513, 352, -513,
- -513, 933, 259, 1134, -513, -513, -513, 289, -513, -513,
- 292, 294, 963, -513, 963, 963, -513, -513, -513, -513,
- -513, 1134, -513, 1223, 27, 367, -513, -513, 274, -513,
- -513, -513, 295, 300, 303, -513, 281, -513, 1223, 444,
- -513, -513, -513, -513, 445, 312, 1134, 1134, 450, 135,
- -513, 1134, 451, -513, 1134, -513
+ 283, 286, 403, 15, 268, 289, -513, -513, 375, -513,
+ -513, 933, 275, 1134, -513, -513, -513, 292, -513, -513,
+ 294, 295, 963, -513, 963, 963, -513, -513, -513, -513,
+ -513, 1134, -513, 1223, 27, 400, -513, -513, 297, -513,
+ -513, -513, 303, 304, 305, -513, 313, -513, 1223, 449,
+ -513, -513, -513, -513, 451, 316, 1134, 1134, 454, 135,
+ -513, 1134, 457, -513, 1134, -513
};
/* YYPGOTO[NTERM-NUM]. */
static const short int yypgoto[] =
{
- -513, -513, -513, 364, 365, 368, 215, 218, 370, 372,
- -98, -97, -507, -513, 436, 456, -141, -513, -303, 60,
+ -513, -513, 246, 369, 370, 372, 225, 226, 373, 377,
+ -98, -97, -507, -513, 436, 458, -141, -513, -303, 63,
-513, -220, -513, -46, -513, -38, -513, -68, -20, -513,
- 130, 246, -230, 51, -513, -513, -513, -513, 433, -513,
- -513, -513, -513, 1, -513, 64, -513, -513, 457, -513,
- -513, -513, -513, -513, 482, -513, -512, -106, -3, -88,
- -513, 448, -513, -89, -513, -513, -513, -513, 45, -13,
- -513, -513, 69, -513, -513
+ 130, 256, -230, 51, -513, -513, -513, -513, 439, -513,
+ -513, -513, -513, 1, -513, 66, -513, -513, 461, -513,
+ -513, -513, -513, -513, 488, -513, -512, -106, -3, -88,
+ -513, 455, -513, -84, -513, -513, -513, -513, 56, 18,
+ -513, -513, 98, -513, -513
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -1468,41 +1468,41 @@ static const short int yytable[] =
134, 134, 125, 138, 139, 140, 141, 142, 143, 144,
145, 19, 60, 20, 62, 320, 321, 322, 134, 134,
108, 351, 352, 552, 109, 355, 31, 32, 33, 34,
- 35, 36, 37, -72, -72, 567, -71, -71, 465, 529,
+ 35, 36, 37, -72, -72, 567, -76, -76, 465, 529,
110, 530, 294, 295, 296, 297, 298, 299, 300, 301,
- 302, 303, 304, 305, 306, 307, 273, 357, -70, -70,
- -69, -69, 101, 102, 273, 273, 273, -177, 111, 126,
+ 302, 303, 304, 305, 306, 307, 273, 357, -71, -71,
+ -75, -75, 101, 102, 273, 273, 273, -177, 111, 126,
64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, 75, 76, 112, 381, 77, 78, 335, 336, 403,
- -113, 122, 86, 123, 19, 131, 20, 216, 5, 212,
- 237, 6, 217, 382, 218, 239, 246, 240, 245, 7,
- 8, 9, 10, 11, 12, 13, 279, 330, -76, -75,
- 383, -74, -73, -79, 338, 273, 273, 273, -80, 401,
- 14, 339, 353, 273, 362, 363, 361, 86, 402, 134,
- 367, 368, 369, 355, 370, 273, 273, 281, 282, 283,
- 284, 285, 286, 450, 371, 452, 453, 454, 374, 388,
- 375, 458, 376, 287, 288, 289, 290, 396, 397, 398,
- 389, 377, 378, 379, 380, 384, 386, 390, 391, 392,
- 393, 394, 273, 273, 395, 399, 400, 273, 404, 273,
- 414, 417, 420, 273, 421, 423, 424, 438, 425, 273,
- 273, 273, 439, 134, 451, 134, 134, 134, 418, 446,
- 449, 134, 459, 455, 456, 457, 462, 464, 463, 79,
- 405, 493, 80, 486, 507, 81, 509, 82, 440, 441,
- 442, 489, 357, 473, 273, 273, 448, 477, 478, 479,
- 480, 273, 482, 483, 484, 485, 490, 491, 460, 461,
- 273, 497, 505, 523, 539, 551, 569, 499, 134, 444,
- 500, 534, 535, 536, 501, 510, 511, 557, 522, 528,
- 512, 531, 533, 542, 506, 146, 147, 273, 543, 544,
- 545, 546, 570, 574, 547, 487, 488, 548, 549, 550,
- 492, 555, 494, 556, 559, 273, 498, 560, 521, 561,
- 571, 134, 502, 503, 504, 572, 146, 147, 573, 576,
- 577, 134, 134, 134, 578, 581, 584, 134, 203, 204,
- 273, 273, 205, 365, 206, 273, 207, 366, 273, 104,
- 56, 471, 347, 114, 470, 26, 59, 526, 527, 97,
- 582, 496, 537, 134, 532, 476, 0, 426, 427, 428,
- 429, 430, 0, 538, 433, 434, 435, 436, 437, 126,
+ 74, 75, 76, 112, 381, 77, 78, -70, -70, 403,
+ -74, -74, 86, -113, 19, 122, 20, 123, 5, 131,
+ 237, 6, 212, 382, -69, -69, 246, -73, -73, 7,
+ 8, 9, 10, 11, 12, 13, 335, 336, 216, 217,
+ 383, 218, 239, 240, 245, 273, 273, 273, 279, 401,
+ 14, 330, -79, 273, -80, 339, 353, 86, 402, 134,
+ 361, 362, 363, 355, 367, 273, 273, 281, 282, 283,
+ 284, 285, 286, 450, 368, 452, 453, 454, 369, 388,
+ 370, 458, 371, 287, 288, 289, 290, 396, 397, 398,
+ 389, 374, 375, 400, 376, 377, 378, 379, 380, 384,
+ 386, 390, 273, 273, 391, 392, 393, 273, 394, 273,
+ 395, 399, 404, 273, 414, 417, 420, 421, 423, 273,
+ 273, 273, 424, 134, 451, 134, 134, 134, 418, 425,
+ 438, 134, 459, 439, 446, 449, 455, 456, 463, 79,
+ 464, 457, 80, 462, 405, 81, 473, 82, 440, 441,
+ 442, 486, 357, 477, 273, 273, 448, 478, 479, 493,
+ 480, 273, 507, 509, 482, 483, 484, 485, 460, 461,
+ 273, 489, 505, 490, 491, 497, 499, 500, 134, 501,
+ 510, 534, 535, 536, 511, 512, 539, 522, 551, 528,
+ 531, 533, 523, 542, 506, 146, 147, 273, 543, 544,
+ 545, 546, 444, 557, 547, 487, 488, 548, 549, 569,
+ 492, 550, 494, 556, 555, 273, 498, 559, 521, 560,
+ 561, 134, 502, 503, 504, 570, 146, 147, 571, 572,
+ 573, 134, 134, 134, 576, 574, 577, 134, 578, 581,
+ 273, 273, 584, 203, 204, 273, 205, 206, 273, 104,
+ 338, 207, 56, 365, 471, 366, 470, 526, 527, 114,
+ 59, 26, 347, 134, 532, 582, 97, 426, 427, 428,
+ 429, 430, 496, 538, 433, 434, 435, 436, 437, 126,
64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, 75, 76, 0, 0, 77, 78, 0, 0, 0,
+ 74, 75, 76, 537, 476, 77, 78, 0, 0, 0,
558, 0, 0, 0, 19, 0, 20, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 565, 0,
0, 0, 0, 0, 474, 475, 0, 0, 0, 0,
@@ -1627,35 +1627,35 @@ static const short int yycheck[] =
17, 18, 77, 78, 320, 321, 322, 0, 151, 3,
4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 156, 280, 19, 20, 17, 18, 327,
- 154, 18, 280, 18, 28, 154, 30, 18, 31, 30,
- 120, 34, 30, 291, 30, 157, 40, 157, 154, 42,
- 43, 44, 45, 46, 47, 48, 60, 152, 18, 18,
- 308, 18, 18, 21, 18, 381, 382, 383, 21, 325,
- 63, 21, 160, 389, 155, 64, 152, 325, 326, 327,
- 154, 154, 154, 361, 154, 401, 402, 102, 103, 104,
+ 17, 18, 280, 154, 28, 18, 30, 18, 31, 154,
+ 120, 34, 30, 291, 17, 18, 40, 17, 18, 42,
+ 43, 44, 45, 46, 47, 48, 17, 18, 18, 30,
+ 308, 30, 157, 157, 154, 381, 382, 383, 60, 325,
+ 63, 152, 21, 389, 21, 21, 160, 325, 326, 327,
+ 152, 155, 64, 361, 154, 401, 402, 102, 103, 104,
105, 106, 107, 391, 154, 393, 394, 395, 154, 312,
154, 399, 154, 118, 119, 120, 121, 320, 321, 322,
- 156, 154, 154, 152, 152, 152, 152, 152, 152, 152,
- 152, 152, 438, 439, 152, 152, 39, 443, 30, 445,
- 30, 160, 152, 449, 155, 30, 154, 15, 154, 455,
- 456, 457, 15, 391, 392, 393, 394, 395, 357, 152,
- 156, 399, 400, 152, 152, 152, 152, 18, 30, 153,
- 37, 18, 156, 39, 57, 159, 30, 161, 381, 382,
- 383, 154, 420, 152, 490, 491, 389, 152, 152, 152,
- 152, 497, 152, 152, 152, 152, 152, 152, 401, 402,
- 506, 152, 154, 156, 18, 15, 39, 152, 446, 57,
- 152, 499, 500, 501, 152, 152, 152, 158, 152, 152,
- 155, 152, 152, 152, 462, 523, 523, 533, 155, 152,
- 152, 155, 158, 152, 155, 438, 439, 155, 155, 155,
+ 156, 154, 154, 39, 154, 154, 154, 152, 152, 152,
+ 152, 152, 438, 439, 152, 152, 152, 443, 152, 445,
+ 152, 152, 30, 449, 30, 160, 152, 155, 30, 455,
+ 456, 457, 154, 391, 392, 393, 394, 395, 357, 154,
+ 15, 399, 400, 15, 152, 156, 152, 152, 30, 153,
+ 18, 152, 156, 152, 37, 159, 152, 161, 381, 382,
+ 383, 39, 420, 152, 490, 491, 389, 152, 152, 18,
+ 152, 497, 57, 30, 152, 152, 152, 152, 401, 402,
+ 506, 154, 154, 152, 152, 152, 152, 152, 446, 152,
+ 152, 499, 500, 501, 152, 155, 18, 152, 15, 152,
+ 152, 152, 156, 152, 462, 523, 523, 533, 155, 152,
+ 152, 155, 57, 158, 155, 438, 439, 155, 155, 39,
443, 155, 445, 531, 155, 551, 449, 155, 486, 155,
- 155, 489, 455, 456, 457, 155, 554, 554, 155, 15,
- 15, 499, 500, 501, 152, 15, 15, 505, 104, 104,
- 576, 577, 104, 258, 104, 581, 104, 259, 584, 43,
- 24, 421, 236, 50, 420, 3, 29, 490, 491, 41,
- 579, 446, 505, 531, 497, 426, -1, 367, 368, 369,
- 370, 371, -1, 506, 374, 375, 376, 377, 378, 3,
+ 155, 489, 455, 456, 457, 158, 554, 554, 155, 155,
+ 155, 499, 500, 501, 15, 152, 15, 505, 152, 15,
+ 576, 577, 15, 104, 104, 581, 104, 104, 584, 43,
+ 234, 104, 24, 258, 421, 259, 420, 490, 491, 50,
+ 29, 3, 236, 531, 497, 579, 41, 367, 368, 369,
+ 370, 371, 446, 506, 374, 375, 376, 377, 378, 3,
4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, -1, -1, 19, 20, -1, -1, -1,
+ 14, 15, 16, 505, 426, 19, 20, -1, -1, -1,
533, -1, -1, -1, 28, -1, 30, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 551, -1,
-1, -1, -1, -1, 424, 425, -1, -1, -1, -1,
@@ -1791,7 +1791,7 @@ static const unsigned char yystos[] =
114, 115, 116, 117, 118, 119, 120, 121, 172, 190,
190, 224, 190, 190, 232, 224, 224, 224, 224, 224,
190, 190, 190, 224, 224, 181, 125, 126, 152, 158,
- 152, 186, 186, 25, 26, 17, 18, 167, 18, 21,
+ 152, 186, 186, 25, 26, 17, 18, 167, 167, 21,
22, 23, 24, 156, 159, 161, 164, 196, 222, 186,
186, 192, 192, 160, 162, 192, 40, 190, 210, 211,
212, 152, 155, 64, 220, 171, 172, 154, 154, 154,
diff --git a/llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs b/llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
index e243074ae66..5a21d7fe368 100644
--- a/llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
+++ b/llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
@@ -1043,7 +1043,7 @@ static const short int yyrhs[] =
190, 159, 197, 160, -1, 190, 161, 197, 162, -1,
190, 161, 162, -1, 190, 22, -1, 190, 23, -1,
190, 222, -1, 190, 196, -1, 190, 24, -1, 175,
- 167, -1, 176, 18, -1, 4, 25, -1, 4, 26,
+ 167, -1, 176, 167, -1, 4, 25, -1, 4, 26,
-1, 178, 21, -1, 174, 154, 195, 39, 190, 155,
-1, 127, 154, 195, 237, 155, -1, 129, 154, 195,
152, 195, 152, 195, 155, -1, 168, 154, 195, 152,
@@ -1375,72 +1375,72 @@ static const short int yypact[] =
132, 146, -513, -513, -513, -513, -513, -513, 873, -26,
-513, -18, -513, 47, 19, 23, 39, 67, -513, 77,
132, 873, 81, 81, -513, -513, 81, 81, -513, -513,
- -513, -513, -513, 86, -513, -513, -513, -513, -513, -513,
- -513, -513, -513, -513, -513, -513, -513, -513, -513, 223,
- 225, -9, 506, -513, 133, 91, -513, -513, -111, -513,
+ -513, -513, -513, 89, -513, -513, -513, -513, -513, -513,
+ -513, -513, -513, -513, -513, -513, -513, -513, -513, 227,
+ 229, -9, 506, -513, 133, 95, -513, -513, -111, -513,
-513, -513, -513, -513, -513, -513, -513, -513, 901, 36,
- 148, -513, -513, -513, 1336, -513, -513, -513, 219, 76,
- 229, 222, 224, -513, -513, -513, -513, -513, 933, 933,
- 963, 933, -513, 98, 100, 614, -513, -513, -111, -104,
- 104, 216, -513, 86, 1134, -513, 1134, 1134, -513, -513,
+ 148, -513, -513, -513, 1336, -513, -513, -513, 222, 76,
+ 250, 239, 241, -513, -513, -513, -513, -513, 933, 933,
+ 963, 933, -513, 115, 116, 614, -513, -513, -111, -104,
+ 120, 216, -513, 89, 1134, -513, 1134, 1134, -513, -513,
-513, -513, -513, -513, -513, -513, -513, -513, 1134, -513,
- 933, -513, 206, 111, -513, -513, -513, -513, -513, -513,
+ 933, -513, 218, 111, -513, -513, -513, -513, -513, -513,
-513, -513, -513, -513, -513, -513, -513, -513, -513, -513,
-513, -513, -513, -513, 195, 84, 933, 933, 933, 933,
933, 933, -513, -513, -513, -513, 933, 933, 933, 933,
-513, -513, -513, -513, -513, -513, -513, -513, -513, -513,
-513, -513, -513, 933, 933, 933, 933, 933, 111, -513,
11, -513, -513, -513, -513, -513, -513, -513, -513, -93,
- 115, 115, 121, 166, 250, 169, 251, 191, 253, 193,
- 254, 252, 257, 220, 256, 260, 1045, 115, 115, 933,
- 933, 122, -73, 933, -513, 701, -513, 134, 129, -513,
- -513, -513, -513, -513, -513, -513, -513, 221, 195, 84,
- 136, 137, 138, 140, 150, 963, 154, 156, 158, 167,
- 168, -513, -513, -513, -513, 171, -513, 172, -513, -513,
+ 129, 129, 121, 166, 169, 191, 193, 220, 223, 237,
+ 240, 261, 263, 249, 249, 264, 1045, 129, 129, 933,
+ 933, 126, -73, 933, -513, 701, -513, 138, 136, -513,
+ -513, -513, -513, -513, -513, -513, -513, 228, 195, 84,
+ 140, 150, 154, 156, 158, 963, 167, 168, 170, 171,
+ 172, -513, -513, -513, -513, 175, -513, 176, -513, -513,
873, -513, -513, -513, -513, -513, -513, -513, -513, -513,
-513, 933, -513, -513, -513, -513, -513, -513, -513, -513,
- -513, -513, -513, -513, -513, -513, -513, -513, 933, 173,
- 174, -513, 1134, 164, 175, 176, 177, 178, 179, 182,
- 1134, 1134, 1134, 183, 297, 873, 933, 933, 308, -513,
+ -513, -513, -513, -513, -513, -513, -513, -513, 933, 177,
+ 178, -513, 1134, 164, 179, 182, 183, 184, 186, 188,
+ 1134, 1134, 1134, 189, 284, 873, 933, 933, 312, -513,
-8, -513, -513, -513, -513, -513, -513, -513, -513, -513,
- -513, -513, -513, 741, 963, 673, 310, -513, -513, -513,
- -513, -113, -99, -513, 181, -111, -513, 133, -513, 190,
- 189, 774, -513, -513, 315, 192, 194, 963, 963, 963,
- 963, 963, -513, -58, 963, 963, 963, 963, 963, 332,
- 337, 1134, 1134, 1134, -2, -513, 9, -513, 207, 1134,
- 204, 933, 933, 933, 933, 933, 211, 212, 213, 933,
- 933, 1134, 1134, 214, -513, 338, 349, -513, 115, -513,
+ -513, -513, -513, 741, 963, 673, 314, -513, -513, -513,
+ -513, -113, -99, -513, 185, -111, -513, 133, -513, 194,
+ 192, 774, -513, -513, 318, 198, 205, 963, 963, 963,
+ 963, 963, -513, -58, 963, 963, 963, 963, 963, 345,
+ 348, 1134, 1134, 1134, -2, -513, 9, -513, 212, 1134,
+ 209, 933, 933, 933, 933, 933, 214, 215, 219, 933,
+ 933, 1134, 1134, 221, -513, 338, 352, -513, 129, -513,
-61, -57, -513, -70, -513, -513, -513, -513, -513, -513,
- 833, 333, -513, 231, 963, 963, 207, 235, 236, 237,
- 238, 963, -513, 240, 241, 242, 243, 334, 1134, 1134,
- 227, 244, 245, 1134, 353, 1134, 933, -513, 249, 1134,
- 255, -513, -513, 258, 262, 1134, 1134, 1134, -513, -513,
+ 833, 337, -513, 224, 963, 963, 212, 231, 235, 236,
+ 238, 963, -513, 242, 243, 244, 245, 342, 1134, 1134,
+ 247, 251, 252, 1134, 371, 1134, 933, -513, 253, 1134,
+ 254, -513, -513, 255, 257, 1134, 1134, 1134, -513, -513,
248, -513, 933, -513, -513, -513, -513, -513, -513, -513,
- -513, -513, 317, 346, 263, 264, 265, 963, 963, 963,
- 963, -513, 963, 963, 963, 963, 933, 266, 247, 933,
- 1134, 1134, 267, -513, 267, -513, 269, 1134, 270, 933,
- 933, 933, -513, -513, -513, 933, 1134, 386, -513, -513,
+ -513, -513, 335, 363, 258, 262, 260, 963, 963, 963,
+ 963, -513, 963, 963, 963, 963, 933, 265, 266, 933,
+ 1134, 1134, 267, -513, 267, -513, 268, 1134, 269, 933,
+ 933, 933, -513, -513, -513, 933, 1134, 398, -513, -513,
963, 963, -513, 271, 273, 277, 278, 276, 279, 282,
- 283, 284, 390, 15, 269, 286, -513, -513, 352, -513,
- -513, 933, 259, 1134, -513, -513, -513, 289, -513, -513,
- 292, 294, 963, -513, 963, 963, -513, -513, -513, -513,
- -513, 1134, -513, 1223, 27, 367, -513, -513, 274, -513,
- -513, -513, 295, 300, 303, -513, 281, -513, 1223, 444,
- -513, -513, -513, -513, 445, 312, 1134, 1134, 450, 135,
- -513, 1134, 451, -513, 1134, -513
+ 283, 286, 403, 15, 268, 289, -513, -513, 375, -513,
+ -513, 933, 275, 1134, -513, -513, -513, 292, -513, -513,
+ 294, 295, 963, -513, 963, 963, -513, -513, -513, -513,
+ -513, 1134, -513, 1223, 27, 400, -513, -513, 297, -513,
+ -513, -513, 303, 304, 305, -513, 313, -513, 1223, 449,
+ -513, -513, -513, -513, 451, 316, 1134, 1134, 454, 135,
+ -513, 1134, 457, -513, 1134, -513
};
/* YYPGOTO[NTERM-NUM]. */
static const short int yypgoto[] =
{
- -513, -513, -513, 364, 365, 368, 215, 218, 370, 372,
- -98, -97, -507, -513, 436, 456, -141, -513, -303, 60,
+ -513, -513, 246, 369, 370, 372, 225, 226, 373, 377,
+ -98, -97, -507, -513, 436, 458, -141, -513, -303, 63,
-513, -220, -513, -46, -513, -38, -513, -68, -20, -513,
- 130, 246, -230, 51, -513, -513, -513, -513, 433, -513,
- -513, -513, -513, 1, -513, 64, -513, -513, 457, -513,
- -513, -513, -513, -513, 482, -513, -512, -106, -3, -88,
- -513, 448, -513, -89, -513, -513, -513, -513, 45, -13,
- -513, -513, 69, -513, -513
+ 130, 256, -230, 51, -513, -513, -513, -513, 439, -513,
+ -513, -513, -513, 1, -513, 66, -513, -513, 461, -513,
+ -513, -513, -513, -513, 488, -513, -512, -106, -3, -88,
+ -513, 455, -513, -84, -513, -513, -513, -513, 56, 18,
+ -513, -513, 98, -513, -513
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -1468,41 +1468,41 @@ static const short int yytable[] =
134, 134, 125, 138, 139, 140, 141, 142, 143, 144,
145, 19, 60, 20, 62, 320, 321, 322, 134, 134,
108, 351, 352, 552, 109, 355, 31, 32, 33, 34,
- 35, 36, 37, -72, -72, 567, -71, -71, 465, 529,
+ 35, 36, 37, -72, -72, 567, -76, -76, 465, 529,
110, 530, 294, 295, 296, 297, 298, 299, 300, 301,
- 302, 303, 304, 305, 306, 307, 273, 357, -70, -70,
- -69, -69, 101, 102, 273, 273, 273, -177, 111, 126,
+ 302, 303, 304, 305, 306, 307, 273, 357, -71, -71,
+ -75, -75, 101, 102, 273, 273, 273, -177, 111, 126,
64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, 75, 76, 112, 381, 77, 78, 335, 336, 403,
- -113, 122, 86, 123, 19, 131, 20, 216, 5, 212,
- 237, 6, 217, 382, 218, 239, 246, 240, 245, 7,
- 8, 9, 10, 11, 12, 13, 279, 330, -76, -75,
- 383, -74, -73, -79, 338, 273, 273, 273, -80, 401,
- 14, 339, 353, 273, 362, 363, 361, 86, 402, 134,
- 367, 368, 369, 355, 370, 273, 273, 281, 282, 283,
- 284, 285, 286, 450, 371, 452, 453, 454, 374, 388,
- 375, 458, 376, 287, 288, 289, 290, 396, 397, 398,
- 389, 377, 378, 379, 380, 384, 386, 390, 391, 392,
- 393, 394, 273, 273, 395, 399, 400, 273, 404, 273,
- 414, 417, 420, 273, 421, 423, 424, 438, 425, 273,
- 273, 273, 439, 134, 451, 134, 134, 134, 418, 446,
- 449, 134, 459, 455, 456, 457, 462, 464, 463, 79,
- 405, 493, 80, 486, 507, 81, 509, 82, 440, 441,
- 442, 489, 357, 473, 273, 273, 448, 477, 478, 479,
- 480, 273, 482, 483, 484, 485, 490, 491, 460, 461,
- 273, 497, 505, 523, 539, 551, 569, 499, 134, 444,
- 500, 534, 535, 536, 501, 510, 511, 557, 522, 528,
- 512, 531, 533, 542, 506, 146, 147, 273, 543, 544,
- 545, 546, 570, 574, 547, 487, 488, 548, 549, 550,
- 492, 555, 494, 556, 559, 273, 498, 560, 521, 561,
- 571, 134, 502, 503, 504, 572, 146, 147, 573, 576,
- 577, 134, 134, 134, 578, 581, 584, 134, 203, 204,
- 273, 273, 205, 365, 206, 273, 207, 366, 273, 104,
- 56, 471, 347, 114, 470, 26, 59, 526, 527, 97,
- 582, 496, 537, 134, 532, 476, 0, 426, 427, 428,
- 429, 430, 0, 538, 433, 434, 435, 436, 437, 126,
+ 74, 75, 76, 112, 381, 77, 78, -70, -70, 403,
+ -74, -74, 86, -113, 19, 122, 20, 123, 5, 131,
+ 237, 6, 212, 382, -69, -69, 246, -73, -73, 7,
+ 8, 9, 10, 11, 12, 13, 335, 336, 216, 217,
+ 383, 218, 239, 240, 245, 273, 273, 273, 279, 401,
+ 14, 330, -79, 273, -80, 339, 353, 86, 402, 134,
+ 361, 362, 363, 355, 367, 273, 273, 281, 282, 283,
+ 284, 285, 286, 450, 368, 452, 453, 454, 369, 388,
+ 370, 458, 371, 287, 288, 289, 290, 396, 397, 398,
+ 389, 374, 375, 400, 376, 377, 378, 379, 380, 384,
+ 386, 390, 273, 273, 391, 392, 393, 273, 394, 273,
+ 395, 399, 404, 273, 414, 417, 420, 421, 423, 273,
+ 273, 273, 424, 134, 451, 134, 134, 134, 418, 425,
+ 438, 134, 459, 439, 446, 449, 455, 456, 463, 79,
+ 464, 457, 80, 462, 405, 81, 473, 82, 440, 441,
+ 442, 486, 357, 477, 273, 273, 448, 478, 479, 493,
+ 480, 273, 507, 509, 482, 483, 484, 485, 460, 461,
+ 273, 489, 505, 490, 491, 497, 499, 500, 134, 501,
+ 510, 534, 535, 536, 511, 512, 539, 522, 551, 528,
+ 531, 533, 523, 542, 506, 146, 147, 273, 543, 544,
+ 545, 546, 444, 557, 547, 487, 488, 548, 549, 569,
+ 492, 550, 494, 556, 555, 273, 498, 559, 521, 560,
+ 561, 134, 502, 503, 504, 570, 146, 147, 571, 572,
+ 573, 134, 134, 134, 576, 574, 577, 134, 578, 581,
+ 273, 273, 584, 203, 204, 273, 205, 206, 273, 104,
+ 338, 207, 56, 365, 471, 366, 470, 526, 527, 114,
+ 59, 26, 347, 134, 532, 582, 97, 426, 427, 428,
+ 429, 430, 496, 538, 433, 434, 435, 436, 437, 126,
64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, 75, 76, 0, 0, 77, 78, 0, 0, 0,
+ 74, 75, 76, 537, 476, 77, 78, 0, 0, 0,
558, 0, 0, 0, 19, 0, 20, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 565, 0,
0, 0, 0, 0, 474, 475, 0, 0, 0, 0,
@@ -1627,35 +1627,35 @@ static const short int yycheck[] =
17, 18, 77, 78, 320, 321, 322, 0, 151, 3,
4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 156, 280, 19, 20, 17, 18, 327,
- 154, 18, 280, 18, 28, 154, 30, 18, 31, 30,
- 120, 34, 30, 291, 30, 157, 40, 157, 154, 42,
- 43, 44, 45, 46, 47, 48, 60, 152, 18, 18,
- 308, 18, 18, 21, 18, 381, 382, 383, 21, 325,
- 63, 21, 160, 389, 155, 64, 152, 325, 326, 327,
- 154, 154, 154, 361, 154, 401, 402, 102, 103, 104,
+ 17, 18, 280, 154, 28, 18, 30, 18, 31, 154,
+ 120, 34, 30, 291, 17, 18, 40, 17, 18, 42,
+ 43, 44, 45, 46, 47, 48, 17, 18, 18, 30,
+ 308, 30, 157, 157, 154, 381, 382, 383, 60, 325,
+ 63, 152, 21, 389, 21, 21, 160, 325, 326, 327,
+ 152, 155, 64, 361, 154, 401, 402, 102, 103, 104,
105, 106, 107, 391, 154, 393, 394, 395, 154, 312,
154, 399, 154, 118, 119, 120, 121, 320, 321, 322,
- 156, 154, 154, 152, 152, 152, 152, 152, 152, 152,
- 152, 152, 438, 439, 152, 152, 39, 443, 30, 445,
- 30, 160, 152, 449, 155, 30, 154, 15, 154, 455,
- 456, 457, 15, 391, 392, 393, 394, 395, 357, 152,
- 156, 399, 400, 152, 152, 152, 152, 18, 30, 153,
- 37, 18, 156, 39, 57, 159, 30, 161, 381, 382,
- 383, 154, 420, 152, 490, 491, 389, 152, 152, 152,
- 152, 497, 152, 152, 152, 152, 152, 152, 401, 402,
- 506, 152, 154, 156, 18, 15, 39, 152, 446, 57,
- 152, 499, 500, 501, 152, 152, 152, 158, 152, 152,
- 155, 152, 152, 152, 462, 523, 523, 533, 155, 152,
- 152, 155, 158, 152, 155, 438, 439, 155, 155, 155,
+ 156, 154, 154, 39, 154, 154, 154, 152, 152, 152,
+ 152, 152, 438, 439, 152, 152, 152, 443, 152, 445,
+ 152, 152, 30, 449, 30, 160, 152, 155, 30, 455,
+ 456, 457, 154, 391, 392, 393, 394, 395, 357, 154,
+ 15, 399, 400, 15, 152, 156, 152, 152, 30, 153,
+ 18, 152, 156, 152, 37, 159, 152, 161, 381, 382,
+ 383, 39, 420, 152, 490, 491, 389, 152, 152, 18,
+ 152, 497, 57, 30, 152, 152, 152, 152, 401, 402,
+ 506, 154, 154, 152, 152, 152, 152, 152, 446, 152,
+ 152, 499, 500, 501, 152, 155, 18, 152, 15, 152,
+ 152, 152, 156, 152, 462, 523, 523, 533, 155, 152,
+ 152, 155, 57, 158, 155, 438, 439, 155, 155, 39,
443, 155, 445, 531, 155, 551, 449, 155, 486, 155,
- 155, 489, 455, 456, 457, 155, 554, 554, 155, 15,
- 15, 499, 500, 501, 152, 15, 15, 505, 104, 104,
- 576, 577, 104, 258, 104, 581, 104, 259, 584, 43,
- 24, 421, 236, 50, 420, 3, 29, 490, 491, 41,
- 579, 446, 505, 531, 497, 426, -1, 367, 368, 369,
- 370, 371, -1, 506, 374, 375, 376, 377, 378, 3,
+ 155, 489, 455, 456, 457, 158, 554, 554, 155, 155,
+ 155, 499, 500, 501, 15, 152, 15, 505, 152, 15,
+ 576, 577, 15, 104, 104, 581, 104, 104, 584, 43,
+ 234, 104, 24, 258, 421, 259, 420, 490, 491, 50,
+ 29, 3, 236, 531, 497, 579, 41, 367, 368, 369,
+ 370, 371, 446, 506, 374, 375, 376, 377, 378, 3,
4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, -1, -1, 19, 20, -1, -1, -1,
+ 14, 15, 16, 505, 426, 19, 20, -1, -1, -1,
533, -1, -1, -1, 28, -1, 30, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 551, -1,
-1, -1, -1, -1, 424, 425, -1, -1, -1, -1,
@@ -1791,7 +1791,7 @@ static const unsigned char yystos[] =
114, 115, 116, 117, 118, 119, 120, 121, 172, 190,
190, 224, 190, 190, 232, 224, 224, 224, 224, 224,
190, 190, 190, 224, 224, 181, 125, 126, 152, 158,
- 152, 186, 186, 25, 26, 17, 18, 167, 18, 21,
+ 152, 186, 186, 25, 26, 17, 18, 167, 167, 21,
22, 23, 24, 156, 159, 161, 164, 196, 222, 186,
186, 192, 192, 160, 162, 192, 40, 190, 210, 211,
212, 152, 155, 64, 220, 171, 172, 154, 154, 154,
diff --git a/llvm/tools/llvm-upgrade/UpgradeParser.y.cvs b/llvm/tools/llvm-upgrade/UpgradeParser.y.cvs
index 12ad18223be..09642661fdb 100644
--- a/llvm/tools/llvm-upgrade/UpgradeParser.y.cvs
+++ b/llvm/tools/llvm-upgrade/UpgradeParser.y.cvs
@@ -708,7 +708,7 @@ ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr
*$$.cnst += " " + *$2;
delete $2;
}
- | UIntType EUINT64VAL { // integral constants
+ | UIntType EInt64Val { // integral constants
$$.type = $1;
$$.cnst = new std::string($1->getNewTy());
*$$.cnst += " " + *$2;
OpenPOWER on IntegriCloud