[ruby-core:84418] [Ruby trunk Bug#14226] Revert line number of "return", "b-return" and "end" events

From: ko1@...
Date: 2017-12-23 10:57:45 UTC
List: ruby-core #84418
SXNzdWUgIzE0MjI2IGhhcyBiZWVuIHVwZGF0ZWQgYnkga28xIChLb2ljaGkgU2FzYWRhKS4KClN1
YmplY3QgY2hhbmdlZCBmcm9tIFJldmVydCBsaW5lIG51bWJlciBvZiAicmV0dXJuIiwgImItcmV0
dXJuIiBhbmQgImMtcmV0dXJuIiBldmVudHMgdG8gUmV2ZXJ0IGxpbmUgbnVtYmVyIG9mICJyZXR1
cm4iLCAiYi1yZXR1cm4iIGFuZCAiZW5kIiBldmVudHMKCk1vZGlmeSB0aXRsZS4KTm90ICJjLXJl
dHVybiIgYnV0ICJlbmQiIChlbmQgb2YgY2xhc3MvbW9kdWxlIHN0YXRlbWVudHMpIGV2ZW50LgoK
Ci0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KQnVnICMxNDIyNjogUmV2
ZXJ0IGxpbmUgbnVtYmVyIG9mICJyZXR1cm4iLCAiYi1yZXR1cm4iIGFuZCAiZW5kIiBldmVudHMK
aHR0cHM6Ly9idWdzLnJ1YnktbGFuZy5vcmcvaXNzdWVzLzE0MjI2I2NoYW5nZS02ODYwOQoKKiBB
dXRob3I6IGtvMSAoS29pY2hpIFNhc2FkYSkKKiBTdGF0dXM6IE9wZW4KKiBQcmlvcml0eTogTm9y
bWFsCiogQXNzaWduZWU6IGtvMSAoS29pY2hpIFNhc2FkYSkKKiBUYXJnZXQgdmVyc2lvbjogMi41
CiogcnVieSAtdjogMi41CiogQmFja3BvcnQ6IDIuMzogVU5LTk9XTiwgMi40OiBVTktOT1dOCi0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KW0ZlYXR1cmUgIzE0MTA0XSBj
aGFuZ2VzIGxpbmUgbnVtYmVycyBvZiBzZXZlcmFsIGV2ZW50cywKCj4gTGluZSBudW1iZXJzIG9u
IDpyZXR1cm4vOmJfcmV0dXJuIGV2ZW50cyBzaG93IHRoZSBsYXN0IGV4ZWN1dGVkIGxpbmVzLCBp
bnN0ZWFkIG9mIGVuZCBsaW5lcyAod2l0aG91dCByZXR1cm4gc3RhdGVtZW50KS4KCkJ1dCBieWVi
dWcsIGEgd2VsbC1rbm93biBkZWJ1Z2dlciBkZXBlbmRzIG9uIHRoaXMgYmVoYXZpb3IuCgpgYGAK
MTogZGVmIGZvbwoyOiAgYmFyCjM6IGVuZApgYGAKCkZvciBleGFtcGxlLCBhIGRlYnVnZ2VyIGNv
bW1hbmQgYCJicmVhayAzImAgbWVhbnMgInRoZSBlbmQgb2YgbWV0aG9kIGNhbGwgb2YgYGZvbyci
LiBJdCBpcyByZWFzb25hYmxlIGZlYXR1cmUgYnV0IG9uIGN1cnJlbnQgUnVieSAyLjVkZXYsICJy
ZXR1cm4iIGV2ZW50IGludm9rZWQgd2l0aCBsaW5lIG51bWJlciAiMiIuIFRoaXMgY2hhbmdlIGJy
ZWFrcyB0aGlzIGJ5ZWJ1ZyBmZWF0dXJlLCBzbyB0aGF0IEkgcmV2ZXJ0IHRoaXMgaW5jb21wYXRp
YmxlIGJlaGF2aW9yIHNvb24gKGJlZm9yZSAyLjUgcmVsZWFzZSkuCgpUaGUgcGF0Y2ggaXMgaGVy
ZToKCmBgYApJbmRleDogY29tcGlsZS5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGNvbXBpbGUuYwko44Oq44OT
44K444On44OzIDYxNDIzKQorKysgY29tcGlsZS5jCSjkvZzmpa3jgrPjg5Tjg7wpCkBAIC02NDYs
NiArNjQ2LDcgQEAKIAkJQ0hFQ0soQ09NUElMRShyZXQsICJibG9jayBib2R5Iiwgbm9kZS0+bmRf
Ym9keSkpOwogCQlBRERfTEFCRUwocmV0LCBlbmQpOwogCQlBRERfVFJBQ0UocmV0LCBSVUJZX0VW
RU5UX0JfUkVUVVJOKTsKKwkJSVNFUV9DT01QSUxFX0RBVEEoaXNlcSktPmxhc3RfbGluZSA9IGlz
ZXEtPmJvZHktPmxvY2F0aW9uLmNvZGVfcmFuZ2UubGFzdF9sb2MubGluZW5vOwogCiAJCS8qIHdp
ZGUgcmFuZ2UgY2F0Y2ggaGFuZGxlciBtdXN0IHB1dCBhdCBsYXN0ICovCiAJCUFERF9DQVRDSF9F
TlRSWShDQVRDSF9UWVBFX1JFRE8sIHN0YXJ0LCBlbmQsIE5VTEwsIHN0YXJ0KTsKQEAgLTY1Nyw2
ICs2NTgsNyBAQAogCQlBRERfVFJBQ0UocmV0LCBSVUJZX0VWRU5UX0NMQVNTKTsKIAkJQ0hFQ0so
Q09NUElMRShyZXQsICJzY29wZWQgbm9kZSIsIG5vZGUtPm5kX2JvZHkpKTsKIAkJQUREX1RSQUNF
KHJldCwgUlVCWV9FVkVOVF9FTkQpOworCQlJU0VRX0NPTVBJTEVfREFUQShpc2VxKS0+bGFzdF9s
aW5lID0gbmRfbGluZShub2RlKTsKIAkJYnJlYWs7CiAJICAgIH0KIAkgIGNhc2UgSVNFUV9UWVBF
X01FVEhPRDoKQEAgLTY2NCw2ICs2NjYsNyBAQAogCQlBRERfVFJBQ0UocmV0LCBSVUJZX0VWRU5U
X0NBTEwpOwogCQlDSEVDSyhDT01QSUxFKHJldCwgInNjb3BlZCBub2RlIiwgbm9kZS0+bmRfYm9k
eSkpOwogCQlBRERfVFJBQ0UocmV0LCBSVUJZX0VWRU5UX1JFVFVSTik7CisJCUlTRVFfQ09NUElM
RV9EQVRBKGlzZXEpLT5sYXN0X2xpbmUgPSBuZF9saW5lKG5vZGUpOwogCQlicmVhazsKIAkgICAg
fQogCSAgZGVmYXVsdDogewpJbmRleDogdGVzdC9ydWJ5L3Rlc3Rfc2V0dHJhY2VmdW5jLnJiCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0KLS0tIHRlc3QvcnVieS90ZXN0X3NldHRyYWNlZnVuYy5yYgko44Oq44OT44K444On
44OzIDYxNDIzKQorKysgdGVzdC9ydWJ5L3Rlc3Rfc2V0dHJhY2VmdW5jLnJiCSjkvZzmpa3jgrPj
g5Tjg7wpCkBAIC03Nyw3ICs3Nyw3IEBACiAgICAgICAgICAgICAgICAgIGV2ZW50cy5zaGlmdCkK
ICAgICBhc3NlcnRfZXF1YWwoWyJjLXJldHVybiIsIDUsIDorLCBJbnRlZ2VyXSwKICAgICAgICAg
ICAgICAgICAgZXZlbnRzLnNoaWZ0KQotICAgIGFzc2VydF9lcXVhbChbInJldHVybiIsIDUsIDph
ZGQsIHNlbGYuY2xhc3NdLAorICAgIGFzc2VydF9lcXVhbChbInJldHVybiIsIDYsIDphZGQsIHNl
bGYuY2xhc3NdLAogICAgICAgICAgICAgICAgICBldmVudHMuc2hpZnQpCiAgICAgYXNzZXJ0X2Vx
dWFsKFsibGluZSIsIDgsIF9fbWV0aG9kX18sIHNlbGYuY2xhc3NdLAogICAgICAgICAgICAgICAg
ICBldmVudHMuc2hpZnQpCkBAIC0xMTYsNyArMTE2LDcgQEAKICAgICAgICAgICAgICAgICAgZXZl
bnRzLnNoaWZ0KQogICAgIGFzc2VydF9lcXVhbChbImMtcmV0dXJuIiwgNSwgOm1ldGhvZF9hZGRl
ZCwgTW9kdWxlXSwKICAgICAgICAgICAgICAgICAgZXZlbnRzLnNoaWZ0KQotICAgIGFzc2VydF9l
cXVhbChbImVuZCIsIDUsIG5pbCwgbmlsXSwKKyAgICBhc3NlcnRfZXF1YWwoWyJlbmQiLCA3LCBu
aWwsIG5pbF0sCiAgICAgICAgICAgICAgICAgIGV2ZW50cy5zaGlmdCkKICAgICBhc3NlcnRfZXF1
YWwoWyJsaW5lIiwgOCwgX19tZXRob2RfXywgc2VsZi5jbGFzc10sCiAgICAgICAgICAgICAgICAg
IGV2ZW50cy5zaGlmdCkKQEAgLTEzMCw3ICsxMzAsNyBAQAogICAgICAgICAgICAgICAgICBldmVu
dHMuc2hpZnQpCiAgICAgYXNzZXJ0X2VxdWFsKFsiY2FsbCIsIDUsIDpiYXIsIEZvb10sCiAgICAg
ICAgICAgICAgICAgIGV2ZW50cy5zaGlmdCkKLSAgICBhc3NlcnRfZXF1YWwoWyJyZXR1cm4iLCA1
LCA6YmFyLCBGb29dLAorICAgIGFzc2VydF9lcXVhbChbInJldHVybiIsIDYsIDpiYXIsIEZvb10s
CiAgICAgICAgICAgICAgICAgIGV2ZW50cy5zaGlmdCkKICAgICBhc3NlcnRfZXF1YWwoWyJsaW5l
IiwgOSwgX19tZXRob2RfXywgc2VsZi5jbGFzc10sCiAgICAgICAgICAgICAgICAgIGV2ZW50cy5z
aGlmdCkKQEAgLTE3Niw3ICsxNzYsNyBAQAogICAgICAgICAgICAgICAgICBldmVudHMuc2hpZnQp
CiAgICAgYXNzZXJ0X2VxdWFsKFsibGluZSIsIDUsIDptZXRoX3JldHVybiwgc2VsZi5jbGFzc10s
CiAgICAgICAgICAgICAgICAgIGV2ZW50cy5zaGlmdCkKLSAgICBhc3NlcnRfZXF1YWwoWyJyZXR1
cm4iLCA1LCA6bWV0aF9yZXR1cm4sIHNlbGYuY2xhc3NdLAorICAgIGFzc2VydF9lcXVhbChbInJl
dHVybiIsIDcsIDptZXRoX3JldHVybiwgc2VsZi5jbGFzc10sCiAgICAgICAgICAgICAgICAgIGV2
ZW50cy5zaGlmdCkKICAgICBhc3NlcnRfZXF1YWwoWyJsaW5lIiwgMTAsIDp0ZXN0X3JldHVybiwg
c2VsZi5jbGFzc10sCiAgICAgICAgICAgICAgICAgIGV2ZW50cy5zaGlmdCkKQEAgLTIxNSw3ICsy
MTUsNyBAQAogICAgICAgICAgICAgICAgICBldmVudHMuc2hpZnQpCiAgICAgYXNzZXJ0X2VxdWFs
KFsibGluZSIsIDYsIDptZXRoX3JldHVybjIsIHNlbGYuY2xhc3NdLAogICAgICAgICAgICAgICAg
ICBldmVudHMuc2hpZnQpCi0gICAgYXNzZXJ0X2VxdWFsKFsicmV0dXJuIiwgNiwgOm1ldGhfcmV0
dXJuMiwgc2VsZi5jbGFzc10sCisgICAgYXNzZXJ0X2VxdWFsKFsicmV0dXJuIiwgNywgOm1ldGhf
cmV0dXJuMiwgc2VsZi5jbGFzc10sCiAgICAgICAgICAgICAgICAgIGV2ZW50cy5zaGlmdCkKICAg
ICBhc3NlcnRfZXF1YWwoWyJsaW5lIiwgOSwgOnRlc3RfcmV0dXJuMiwgc2VsZi5jbGFzc10sCiAg
ICAgICAgICAgICAgICAgIGV2ZW50cy5zaGlmdCkKQEAgLTM0Myw3ICszNDMsNyBAQAogICAgICBb
ImxpbmUiLCA0LCBuaWwsIG5pbF0sCiAgICAgIFsiYy1jYWxsIiwgNCwgOm1ldGhvZF9hZGRlZCwg
TW9kdWxlXSwKICAgICAgWyJjLXJldHVybiIsIDQsIDptZXRob2RfYWRkZWQsIE1vZHVsZV0sCi0g
ICAgIFsiZW5kIiwgNCwgbmlsLCBuaWxdLAorICAgICBbImVuZCIsIDcsIG5pbCwgbmlsXSwKICAg
ICAgWyJsaW5lIiwgOCwgX19tZXRob2RfXywgc2VsZi5jbGFzc10sCiAgICAgIFsiYy1jYWxsIiwg
OCwgOm5ldywgQ2xhc3NdLAogICAgICBbImMtY2FsbCIsIDgsIDppbml0aWFsaXplLCBCYXNpY09i
amVjdF0sCkBAIC0zNTMsNyArMzUzLDcgQEAKICAgICAgWyJsaW5lIiwgNSwgOmZvbywgVGhyZWFk
VHJhY2VJbm5lckNsYXNzXSwKICAgICAgWyJjLWNhbGwiLCA1LCA6KywgSW50ZWdlcl0sCiAgICAg
IFsiYy1yZXR1cm4iLCA1LCA6KywgSW50ZWdlcl0sCi0gICAgIFsicmV0dXJuIiwgNSwgOmZvbywg
VGhyZWFkVHJhY2VJbm5lckNsYXNzXSwKKyAgICAgWyJyZXR1cm4iLCA2LCA6Zm9vLCBUaHJlYWRU
cmFjZUlubmVyQ2xhc3NdLAogICAgICBbImxpbmUiLCA5LCBfX21ldGhvZF9fLCBzZWxmLmNsYXNz
XSwKICAgICAgWyJjLWNhbGwiLCA5LCA6c2V0X3RyYWNlX2Z1bmMsIFRocmVhZF1dLmVhY2ggZG8g
fGV8CiAgICAgICBbOnNldCwgOmFkZF0uZWFjaCBkbyB8dHlwZXwKQEAgLTQ4Nyw3ICs0ODcsNyBA
QAogICAgICBbOmxpbmUsICAgIDEzLCAieHl6enkiLCBuaWwsICAgICAgICAgbmlsLCAgICAgICAg
ICAgICAgeHl6enkuY2xhc3MsIDpYWVpaWV9vdXRlciwgOm5vdGhpbmddLAogICAgICBbOmNfY2Fs
bCwgIDEzLCAieHl6enkiLCBNb2R1bGUsICAgICAgOm1ldGhvZF9hZGRlZCwgICAgeHl6enkuY2xh
c3MsIDpYWVpaWV9vdXRlciwgOm5vdGhpbmddLAogICAgICBbOmNfcmV0dXJuLDEzLCAieHl6enki
LCBNb2R1bGUsICAgICAgOm1ldGhvZF9hZGRlZCwgICAgeHl6enkuY2xhc3MsIDpYWVpaWV9vdXRl
ciwgbmlsXSwKLSAgICAgWzplbmQsICAgICAxMywgInh5enp5IiwgbmlsLCAgICAgICAgIG5pbCwg
ICAgICAgICAgICAgIHh5enp5LmNsYXNzLCA6WFlaWllfb3V0ZXIsIDpub3RoaW5nXSwKKyAgICAg
WzplbmQsICAgICAxNywgInh5enp5IiwgbmlsLCAgICAgICAgIG5pbCwgICAgICAgICAgICAgIHh5
enp5LmNsYXNzLCA6WFlaWllfb3V0ZXIsIDpub3RoaW5nXSwKICAgICAgWzpsaW5lLCAgICAxOCwg
Inh5enp5IiwgVGVzdFNldFRyYWNlRnVuYywgbWV0aG9kLCAgICAgIHNlbGYsICAgICAgICA6b3V0
ZXIsIDpub3RoaW5nXSwKICAgICAgWzpjX2NhbGwsICAxOCwgInh5enp5IiwgQ2xhc3MsICAgICAg
IDpuZXcsICAgICAgICAgICAgIHh5enp5LmNsYXNzLCA6b3V0ZXIsIDpub3RoaW5nXSwKICAgICAg
WzpjX2NhbGwsICAxOCwgInh5enp5IiwgQmFzaWNPYmplY3QsIDppbml0aWFsaXplLCAgICAgIHh5
enp5LCAgICAgICA6b3V0ZXIsIDpub3RoaW5nXSwKQEAgLTUwMiw4ICs1MDIsOCBAQAogICAgICBb
OmxpbmUsICAgIDE1LCAieHl6enkiLCB4eXp6eS5jbGFzcywgOmJhciwgICAgICAgICAgICAgeHl6
enksICAgICAgIDpYWVpaWV9iYXIsIDpub3RoaW5nXSwKICAgICAgWzpjX2NhbGwsICAxNSwgInh5
enp5IiwgS2VybmVsLCAgICAgIDp0YXAsICAgICAgICAgICAgIHh5enp5LCAgICAgICA6WFlaWllf
YmFyLCA6bm90aGluZ10sCiAgICAgIFs6Y19yZXR1cm4sMTUsICJ4eXp6eSIsIEtlcm5lbCwgICAg
ICA6dGFwLCAgICAgICAgICAgICB4eXp6eSwgICAgICAgOlhZWlpZX2JhciwgeHl6enldLAotICAg
ICBbOnJldHVybiwgIDE1LCAieHl6enkiLCB4eXp6eS5jbGFzcywgOmJhciwgICAgICAgICAgICAg
eHl6enksICAgICAgIDpYWVpaWV9iYXIsIHh5enp5XSwKLSAgICAgWzpyZXR1cm4sICAxMSwgInh5
enp5IiwgeHl6enkuY2xhc3MsIDpmb28sICAgICAgICAgICAgIHh5enp5LCAgICAgICA6WFlaWllf
Zm9vLCB4eXp6eV0sCisgICAgIFs6cmV0dXJuLCAgMTYsICJ4eXp6eSIsIHh5enp5LmNsYXNzLCA6
YmFyLCAgICAgICAgICAgICB4eXp6eSwgICAgICAgOlhZWlpZX2JhciwgeHl6enldLAorICAgICBb
OnJldHVybiwgIDEyLCAieHl6enkiLCB4eXp6eS5jbGFzcywgOmZvbywgICAgICAgICAgICAgeHl6
enksICAgICAgIDpYWVpaWV9mb28sIHh5enp5XSwKICAgICAgWzpsaW5lLCAgICAyMCwgInh5enp5
IiwgVGVzdFNldFRyYWNlRnVuYywgbWV0aG9kLCAgICAgIHNlbGYsICAgICAgICA6b3V0ZXIsIDpu
b3RoaW5nXSwKICAgICAgWzpjX2NhbGwsICAyMCwgInh5enp5IiwgS2VybmVsLCAgICAgIDpyYWlz
ZSwgICAgICAgICAgIHNlbGYsICAgICAgICA6b3V0ZXIsIDpub3RoaW5nXSwKICAgICAgWzpjX2Nh
bGwsICAyMCwgInh5enp5IiwgRXhjZXB0aW9uLCAgIDpleGNlcHRpb24sICAgICAgIFJ1bnRpbWVF
cnJvciwgOm91dGVyLCA6bm90aGluZ10sCkBAIC0xODAwLDcgKzE4MDAsNyBAQAogICAgIGFzc2Vy
dF9lcXVhbCBbImxpbmUiLCBiYXNlX2xpbmUgKyA3XSwgICAgIGV2ZW50c1s0XQogICAgIGFzc2Vy
dF9lcXVhbCBbImxpbmUiLCBiYXNlX2xpbmUgKyA4XSwgICAgIGV2ZW50c1s1XQogICAgIGFzc2Vy
dF9lcXVhbCBbImNhbGwiLCBiYXNlX2xpbmUgKyAtNl0sICAgIGV2ZW50c1s2XQotICAgIGFzc2Vy
dF9lcXVhbCBbInJldHVybiIsIGJhc2VfbGluZSArIC02XSwgIGV2ZW50c1s3XQorICAgIGFzc2Vy
dF9lcXVhbCBbInJldHVybiIsIGJhc2VfbGluZSArIC00XSwgIGV2ZW50c1s3XQogICAgIGFzc2Vy
dF9lcXVhbCBbImxpbmUiLCBiYXNlX2xpbmUgKyA5XSwgICAgIGV2ZW50c1s4XQogICAgIGFzc2Vy
dF9lcXVhbCBuaWwsICAgICAgICAgICAgICAgICAgICAgICAgIGV2ZW50c1s5XQogCkBAIC0xODM1
LDcgKzE4MzUsNyBAQAogICAgIGFzc2VydF9lcXVhbCBbImxpbmUiLCBiYXNlX2xpbmUgKyAzMl0s
ICAgICBldmVudHNbMV0KICAgICBhc3NlcnRfZXF1YWwgWyJsaW5lIiwgYmFzZV9saW5lICsgMzNd
LCAgICAgZXZlbnRzWzJdCiAgICAgYXNzZXJ0X2VxdWFsIFsiY2FsbCIsIGJhc2VfbGluZSArIC02
XSwgICAgIGV2ZW50c1szXQotICAgIGFzc2VydF9lcXVhbCBbInJldHVybiIsIGJhc2VfbGluZSAr
IC02XSwgICBldmVudHNbNF0KKyAgICBhc3NlcnRfZXF1YWwgWyJyZXR1cm4iLCBiYXNlX2xpbmUg
KyAtNF0sICAgZXZlbnRzWzRdCiAgICAgYXNzZXJ0X2VxdWFsIFsibGluZSIsIGJhc2VfbGluZSAr
IDM0XSwgICAgIGV2ZW50c1s1XQogICAgIGFzc2VydF9lcXVhbCBbImxpbmUiLCBiYXNlX2xpbmUg
KyAzNV0sICAgICBldmVudHNbNl0KICAgICBhc3NlcnRfZXF1YWwgWyJjLWNhbGwiLCBiYXNlX2xp
bmUgKyAzNV0sICAgZXZlbnRzWzddICMgVGhyZWFkLmN1cnJlbnQKYGBgCgoKCgotLSAKaHR0cHM6
Ly9idWdzLnJ1YnktbGFuZy5vcmcvCgpVbnN1YnNjcmliZTogPG1haWx0bzpydWJ5LWNvcmUtcmVx
dWVzdEBydWJ5LWxhbmcub3JnP3N1YmplY3Q9dW5zdWJzY3JpYmU+CjxodHRwOi8vbGlzdHMucnVi
eS1sYW5nLm9yZy9jZ2ktYmluL21haWxtYW4vb3B0aW9ucy9ydWJ5LWNvcmU+Cg==

In This Thread

Prev Next