]> Cypherpunks repositories - gostls13.git/commitdiff
[dev.regabi] cmd/compile: remove ODCLFIELD and ODDD ops
authorRuss Cox <rsc@golang.org>
Sun, 29 Nov 2020 13:58:39 +0000 (08:58 -0500)
committerRuss Cox <rsc@golang.org>
Mon, 30 Nov 2020 19:45:23 +0000 (19:45 +0000)
These are plain data now, not nodes (see previous CL).
The opcode deletions are not safe for toolstash -cmp,
so they are split into a separate CL.

Change-Id: Icef8a01e190195a7539a35b92f42835d823e314a
Reviewed-on: https://go-review.googlesource.com/c/go/+/274104
Trust: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
src/cmd/compile/internal/ir/node.go
src/cmd/compile/internal/ir/op_string.go

index 74557236ccb1d001e10d5bc5b5c0e96d60139622..2850704ae1803a196cec7c458a7fd99529db90eb 100644 (file)
@@ -457,7 +457,6 @@ const (
 
        // Used during parsing but don't last.
        ODCLFUNC  // func f() or func (r) f()
-       ODCLFIELD // UNUSED: TODO(rsc): Delete.
        ODCLCONST // const pi = 3.14
        ODCLTYPE  // type Int int or type Int = int
 
@@ -580,7 +579,6 @@ const (
        OTSLICE // []int
 
        // misc
-       ODDD         // UNUSED; TODO(rsc): Delete.
        OINLCALL     // intermediary representation of an inlined call.
        OEFACE       // itable and data words of an empty-interface value.
        OITAB        // itable word of an interface value.
index faec164c7bfab944d633c1a64da378a9e41432fe..eefdc0ee590b8c889048ecd386ee1b826c9780ee 100644 (file)
@@ -56,119 +56,117 @@ func _() {
        _ = x[OCOPY-45]
        _ = x[ODCL-46]
        _ = x[ODCLFUNC-47]
-       _ = x[ODCLFIELD-48]
-       _ = x[ODCLCONST-49]
-       _ = x[ODCLTYPE-50]
-       _ = x[ODELETE-51]
-       _ = x[ODOT-52]
-       _ = x[ODOTPTR-53]
-       _ = x[ODOTMETH-54]
-       _ = x[ODOTINTER-55]
-       _ = x[OXDOT-56]
-       _ = x[ODOTTYPE-57]
-       _ = x[ODOTTYPE2-58]
-       _ = x[OEQ-59]
-       _ = x[ONE-60]
-       _ = x[OLT-61]
-       _ = x[OLE-62]
-       _ = x[OGE-63]
-       _ = x[OGT-64]
-       _ = x[ODEREF-65]
-       _ = x[OINDEX-66]
-       _ = x[OINDEXMAP-67]
-       _ = x[OKEY-68]
-       _ = x[OSTRUCTKEY-69]
-       _ = x[OLEN-70]
-       _ = x[OMAKE-71]
-       _ = x[OMAKECHAN-72]
-       _ = x[OMAKEMAP-73]
-       _ = x[OMAKESLICE-74]
-       _ = x[OMAKESLICECOPY-75]
-       _ = x[OMUL-76]
-       _ = x[ODIV-77]
-       _ = x[OMOD-78]
-       _ = x[OLSH-79]
-       _ = x[ORSH-80]
-       _ = x[OAND-81]
-       _ = x[OANDNOT-82]
-       _ = x[ONEW-83]
-       _ = x[ONEWOBJ-84]
-       _ = x[ONOT-85]
-       _ = x[OBITNOT-86]
-       _ = x[OPLUS-87]
-       _ = x[ONEG-88]
-       _ = x[OOROR-89]
-       _ = x[OPANIC-90]
-       _ = x[OPRINT-91]
-       _ = x[OPRINTN-92]
-       _ = x[OPAREN-93]
-       _ = x[OSEND-94]
-       _ = x[OSLICE-95]
-       _ = x[OSLICEARR-96]
-       _ = x[OSLICESTR-97]
-       _ = x[OSLICE3-98]
-       _ = x[OSLICE3ARR-99]
-       _ = x[OSLICEHEADER-100]
-       _ = x[ORECOVER-101]
-       _ = x[ORECV-102]
-       _ = x[ORUNESTR-103]
-       _ = x[OSELRECV-104]
-       _ = x[OSELRECV2-105]
-       _ = x[OIOTA-106]
-       _ = x[OREAL-107]
-       _ = x[OIMAG-108]
-       _ = x[OCOMPLEX-109]
-       _ = x[OALIGNOF-110]
-       _ = x[OOFFSETOF-111]
-       _ = x[OSIZEOF-112]
-       _ = x[OMETHEXPR-113]
-       _ = x[OBLOCK-114]
-       _ = x[OBREAK-115]
-       _ = x[OCASE-116]
-       _ = x[OCONTINUE-117]
-       _ = x[ODEFER-118]
-       _ = x[OEMPTY-119]
-       _ = x[OFALL-120]
-       _ = x[OFOR-121]
-       _ = x[OFORUNTIL-122]
-       _ = x[OGOTO-123]
-       _ = x[OIF-124]
-       _ = x[OLABEL-125]
-       _ = x[OGO-126]
-       _ = x[ORANGE-127]
-       _ = x[ORETURN-128]
-       _ = x[OSELECT-129]
-       _ = x[OSWITCH-130]
-       _ = x[OTYPESW-131]
-       _ = x[OTCHAN-132]
-       _ = x[OTMAP-133]
-       _ = x[OTSTRUCT-134]
-       _ = x[OTINTER-135]
-       _ = x[OTFUNC-136]
-       _ = x[OTARRAY-137]
-       _ = x[OTSLICE-138]
-       _ = x[ODDD-139]
-       _ = x[OINLCALL-140]
-       _ = x[OEFACE-141]
-       _ = x[OITAB-142]
-       _ = x[OIDATA-143]
-       _ = x[OSPTR-144]
-       _ = x[OCLOSUREREAD-145]
-       _ = x[OCFUNC-146]
-       _ = x[OCHECKNIL-147]
-       _ = x[OVARDEF-148]
-       _ = x[OVARKILL-149]
-       _ = x[OVARLIVE-150]
-       _ = x[ORESULT-151]
-       _ = x[OINLMARK-152]
-       _ = x[ORETJMP-153]
-       _ = x[OGETG-154]
-       _ = x[OEND-155]
+       _ = x[ODCLCONST-48]
+       _ = x[ODCLTYPE-49]
+       _ = x[ODELETE-50]
+       _ = x[ODOT-51]
+       _ = x[ODOTPTR-52]
+       _ = x[ODOTMETH-53]
+       _ = x[ODOTINTER-54]
+       _ = x[OXDOT-55]
+       _ = x[ODOTTYPE-56]
+       _ = x[ODOTTYPE2-57]
+       _ = x[OEQ-58]
+       _ = x[ONE-59]
+       _ = x[OLT-60]
+       _ = x[OLE-61]
+       _ = x[OGE-62]
+       _ = x[OGT-63]
+       _ = x[ODEREF-64]
+       _ = x[OINDEX-65]
+       _ = x[OINDEXMAP-66]
+       _ = x[OKEY-67]
+       _ = x[OSTRUCTKEY-68]
+       _ = x[OLEN-69]
+       _ = x[OMAKE-70]
+       _ = x[OMAKECHAN-71]
+       _ = x[OMAKEMAP-72]
+       _ = x[OMAKESLICE-73]
+       _ = x[OMAKESLICECOPY-74]
+       _ = x[OMUL-75]
+       _ = x[ODIV-76]
+       _ = x[OMOD-77]
+       _ = x[OLSH-78]
+       _ = x[ORSH-79]
+       _ = x[OAND-80]
+       _ = x[OANDNOT-81]
+       _ = x[ONEW-82]
+       _ = x[ONEWOBJ-83]
+       _ = x[ONOT-84]
+       _ = x[OBITNOT-85]
+       _ = x[OPLUS-86]
+       _ = x[ONEG-87]
+       _ = x[OOROR-88]
+       _ = x[OPANIC-89]
+       _ = x[OPRINT-90]
+       _ = x[OPRINTN-91]
+       _ = x[OPAREN-92]
+       _ = x[OSEND-93]
+       _ = x[OSLICE-94]
+       _ = x[OSLICEARR-95]
+       _ = x[OSLICESTR-96]
+       _ = x[OSLICE3-97]
+       _ = x[OSLICE3ARR-98]
+       _ = x[OSLICEHEADER-99]
+       _ = x[ORECOVER-100]
+       _ = x[ORECV-101]
+       _ = x[ORUNESTR-102]
+       _ = x[OSELRECV-103]
+       _ = x[OSELRECV2-104]
+       _ = x[OIOTA-105]
+       _ = x[OREAL-106]
+       _ = x[OIMAG-107]
+       _ = x[OCOMPLEX-108]
+       _ = x[OALIGNOF-109]
+       _ = x[OOFFSETOF-110]
+       _ = x[OSIZEOF-111]
+       _ = x[OMETHEXPR-112]
+       _ = x[OBLOCK-113]
+       _ = x[OBREAK-114]
+       _ = x[OCASE-115]
+       _ = x[OCONTINUE-116]
+       _ = x[ODEFER-117]
+       _ = x[OEMPTY-118]
+       _ = x[OFALL-119]
+       _ = x[OFOR-120]
+       _ = x[OFORUNTIL-121]
+       _ = x[OGOTO-122]
+       _ = x[OIF-123]
+       _ = x[OLABEL-124]
+       _ = x[OGO-125]
+       _ = x[ORANGE-126]
+       _ = x[ORETURN-127]
+       _ = x[OSELECT-128]
+       _ = x[OSWITCH-129]
+       _ = x[OTYPESW-130]
+       _ = x[OTCHAN-131]
+       _ = x[OTMAP-132]
+       _ = x[OTSTRUCT-133]
+       _ = x[OTINTER-134]
+       _ = x[OTFUNC-135]
+       _ = x[OTARRAY-136]
+       _ = x[OTSLICE-137]
+       _ = x[OINLCALL-138]
+       _ = x[OEFACE-139]
+       _ = x[OITAB-140]
+       _ = x[OIDATA-141]
+       _ = x[OSPTR-142]
+       _ = x[OCLOSUREREAD-143]
+       _ = x[OCFUNC-144]
+       _ = x[OCHECKNIL-145]
+       _ = x[OVARDEF-146]
+       _ = x[OVARKILL-147]
+       _ = x[OVARLIVE-148]
+       _ = x[ORESULT-149]
+       _ = x[OINLMARK-150]
+       _ = x[ORETJMP-151]
+       _ = x[OGETG-152]
+       _ = x[OEND-153]
 }
 
-const _Op_name = "XXXNAMENONAMETYPEPACKLITERALNILADDSUBORXORADDSTRADDRANDANDAPPENDBYTES2STRBYTES2STRTMPRUNES2STRSTR2BYTESSTR2BYTESTMPSTR2RUNESASAS2AS2DOTTYPEAS2FUNCAS2MAPRAS2RECVASOPCALLCALLFUNCCALLMETHCALLINTERCALLPARTCAPCLOSECLOSURECOMPLITMAPLITSTRUCTLITARRAYLITSLICELITPTRLITCONVCONVIFACECONVNOPCOPYDCLDCLFUNCDCLFIELDDCLCONSTDCLTYPEDELETEDOTDOTPTRDOTMETHDOTINTERXDOTDOTTYPEDOTTYPE2EQNELTLEGEGTDEREFINDEXINDEXMAPKEYSTRUCTKEYLENMAKEMAKECHANMAKEMAPMAKESLICEMAKESLICECOPYMULDIVMODLSHRSHANDANDNOTNEWNEWOBJNOTBITNOTPLUSNEGORORPANICPRINTPRINTNPARENSENDSLICESLICEARRSLICESTRSLICE3SLICE3ARRSLICEHEADERRECOVERRECVRUNESTRSELRECVSELRECV2IOTAREALIMAGCOMPLEXALIGNOFOFFSETOFSIZEOFMETHEXPRBLOCKBREAKCASECONTINUEDEFEREMPTYFALLFORFORUNTILGOTOIFLABELGORANGERETURNSELECTSWITCHTYPESWTCHANTMAPTSTRUCTTINTERTFUNCTARRAYTSLICEDDDINLCALLEFACEITABIDATASPTRCLOSUREREADCFUNCCHECKNILVARDEFVARKILLVARLIVERESULTINLMARKRETJMPGETGEND"
+const _Op_name = "XXXNAMENONAMETYPEPACKLITERALNILADDSUBORXORADDSTRADDRANDANDAPPENDBYTES2STRBYTES2STRTMPRUNES2STRSTR2BYTESSTR2BYTESTMPSTR2RUNESASAS2AS2DOTTYPEAS2FUNCAS2MAPRAS2RECVASOPCALLCALLFUNCCALLMETHCALLINTERCALLPARTCAPCLOSECLOSURECOMPLITMAPLITSTRUCTLITARRAYLITSLICELITPTRLITCONVCONVIFACECONVNOPCOPYDCLDCLFUNCDCLCONSTDCLTYPEDELETEDOTDOTPTRDOTMETHDOTINTERXDOTDOTTYPEDOTTYPE2EQNELTLEGEGTDEREFINDEXINDEXMAPKEYSTRUCTKEYLENMAKEMAKECHANMAKEMAPMAKESLICEMAKESLICECOPYMULDIVMODLSHRSHANDANDNOTNEWNEWOBJNOTBITNOTPLUSNEGORORPANICPRINTPRINTNPARENSENDSLICESLICEARRSLICESTRSLICE3SLICE3ARRSLICEHEADERRECOVERRECVRUNESTRSELRECVSELRECV2IOTAREALIMAGCOMPLEXALIGNOFOFFSETOFSIZEOFMETHEXPRBLOCKBREAKCASECONTINUEDEFEREMPTYFALLFORFORUNTILGOTOIFLABELGORANGERETURNSELECTSWITCHTYPESWTCHANTMAPTSTRUCTTINTERTFUNCTARRAYTSLICEINLCALLEFACEITABIDATASPTRCLOSUREREADCFUNCCHECKNILVARDEFVARKILLVARLIVERESULTINLMARKRETJMPGETGEND"
 
-var _Op_index = [...]uint16{0, 3, 7, 13, 17, 21, 28, 31, 34, 37, 39, 42, 48, 52, 58, 64, 73, 85, 94, 103, 115, 124, 126, 129, 139, 146, 153, 160, 164, 168, 176, 184, 193, 201, 204, 209, 216, 223, 229, 238, 246, 254, 260, 264, 273, 280, 284, 287, 294, 302, 310, 317, 323, 326, 332, 339, 347, 351, 358, 366, 368, 370, 372, 374, 376, 378, 383, 388, 396, 399, 408, 411, 415, 423, 430, 439, 452, 455, 458, 461, 464, 467, 470, 476, 479, 485, 488, 494, 498, 501, 505, 510, 515, 521, 526, 530, 535, 543, 551, 557, 566, 577, 584, 588, 595, 602, 610, 614, 618, 622, 629, 636, 644, 650, 658, 663, 668, 672, 680, 685, 690, 694, 697, 705, 709, 711, 716, 718, 723, 729, 735, 741, 747, 752, 756, 763, 769, 774, 780, 786, 789, 796, 801, 805, 810, 814, 825, 830, 838, 844, 851, 858, 864, 871, 877, 881, 884}
+var _Op_index = [...]uint16{0, 3, 7, 13, 17, 21, 28, 31, 34, 37, 39, 42, 48, 52, 58, 64, 73, 85, 94, 103, 115, 124, 126, 129, 139, 146, 153, 160, 164, 168, 176, 184, 193, 201, 204, 209, 216, 223, 229, 238, 246, 254, 260, 264, 273, 280, 284, 287, 294, 302, 309, 315, 318, 324, 331, 339, 343, 350, 358, 360, 362, 364, 366, 368, 370, 375, 380, 388, 391, 400, 403, 407, 415, 422, 431, 444, 447, 450, 453, 456, 459, 462, 468, 471, 477, 480, 486, 490, 493, 497, 502, 507, 513, 518, 522, 527, 535, 543, 549, 558, 569, 576, 580, 587, 594, 602, 606, 610, 614, 621, 628, 636, 642, 650, 655, 660, 664, 672, 677, 682, 686, 689, 697, 701, 703, 708, 710, 715, 721, 727, 733, 739, 744, 748, 755, 761, 766, 772, 778, 785, 790, 794, 799, 803, 814, 819, 827, 833, 840, 847, 853, 860, 866, 870, 873}
 
 func (i Op) String() string {
        if i >= Op(len(_Op_index)-1) {