135019 2014-07-17 12:28:13 -0700 [ftlopt] DFG Flush(SetLocal) store elimination is overzealous for captured variables in the presence of nodes that have no effects but may throw (merge trunk r171190) 2014-07-17 22:56:20 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 134988 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 1023066 0 fpizlo 2014-07-17 12:28:13 -0700 This is about merging https://bugs.webkit.org/show_bug.cgi?id=134988. The merge requires some finesse so I'd rather get another review. 1023067 1 235084 fpizlo 2014-07-17 12:31:15 -0700 Created attachment 235084 the patch 1023207 2 fpizlo 2014-07-17 22:56:20 -0700 Landed in http://trac.webkit.org/changeset/171214 235084 2014-07-17 12:31:15 -0700 2014-07-17 13:25:00 -0700 the patch blah.patch text/plain 6385 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTcxMTkyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBA CisyMDE0LTA3LTE3ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg W2Z0bG9wdF0gREZHIEZsdXNoKFNldExvY2FsKSBzdG9yZSBlbGltaW5hdGlvbiBpcyBvdmVyemVh bG91cyBmb3IgY2FwdHVyZWQgdmFyaWFibGVzIGluIHRoZSBwcmVzZW5jZSBvZiBub2RlcyB0aGF0 IGhhdmUgbm8gZWZmZWN0cyBidXQgbWF5IHRocm93IChtZXJnZSB0cnVuayByMTcxMTkwKQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1MDE5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBCZWhh dmlvcmFsbHksIHRoaXMgaXMganVzdCBhIG1lcmdlIG9mIHRydW5rIHIxNzExOTAsIGV4Y2VwdCB0 aGF0IHRoZSByZWxldmFudCBmdW5jdGlvbmFsaXR5CisgICAgICAgIGhhcyBtb3ZlZCB0byBTdHJl bmd0aFJlZHVjdGlvblBoYXNlIGFuZCBpcyB3cml0dGVuIGluIGEgZGlmZmVyZW50IHN0eWxlLiBT YW1lIGFsZ29yaXRobSwKKyAgICAgICAgZGlmZmVyZW50IGNvZGUuCisKKyAgICAgICAgKiBkZmcv REZHTm9kZVR5cGUuaDoKKyAgICAgICAgKiBkZmcvREZHU3RyZW5ndGhSZWR1Y3Rpb25QaGFzZS5j cHA6CisgICAgICAgIChKU0M6OkRGRzo6U3RyZW5ndGhSZWR1Y3Rpb25QaGFzZTo6aGFuZGxlTm9k ZSk6CisgICAgICAgICogdGVzdHMvc3RyZXNzL2NhcHR1cmUtZXNjYXBlLWFuZC10aHJvdy5qczog QWRkZWQuCisgICAgICAgIChmb28uZik6CisgICAgICAgIChmb28pOgorICAgICAgICAqIHRlc3Rz L3N0cmVzcy9uZXctYXJyYXktd2l0aC1zaXplLXRocm93LWV4Y2VwdGlvbi1hbmQtdGVhci1vZmYt YXJndW1lbnRzLmpzOiBBZGRlZC4KKyAgICAgICAgKGZvbyk6CisgICAgICAgIChiYXIpOgorCiAy MDE0LTA3LTE1ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAgICAgW2Z0 bG9wdF0gQ29uc3RhbnQgZm9sZCBHZXRHZXR0ZXIgYW5kIEdldFNldHRlciBpZiB0aGUgR2V0dGVy U2V0dGVyIGlzIGEgY29uc3RhbnQKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH Tm9kZVR5cGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05v ZGVUeXBlLmgJKHJldmlzaW9uIDE3MTE5MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHTm9kZVR5cGUuaAkod29ya2luZyBjb3B5KQpAQCAtMjE2LDcgKzIxNiw3IEBAIG5hbWVzcGFj ZSBKU0MgeyBuYW1lc3BhY2UgREZHIHsKICAgICAvKiBBbGxvY2F0aW9ucy4gKi9cCiAgICAgbWFj cm8oTmV3T2JqZWN0LCBOb2RlUmVzdWx0SlMpIFwKICAgICBtYWNybyhOZXdBcnJheSwgTm9kZVJl c3VsdEpTIHwgTm9kZUhhc1ZhckFyZ3MpIFwKLSAgICBtYWNybyhOZXdBcnJheVdpdGhTaXplLCBO b2RlUmVzdWx0SlMpIFwKKyAgICBtYWNybyhOZXdBcnJheVdpdGhTaXplLCBOb2RlUmVzdWx0SlMg fCBOb2RlTXVzdEdlbmVyYXRlKSBcCiAgICAgbWFjcm8oTmV3QXJyYXlCdWZmZXIsIE5vZGVSZXN1 bHRKUykgXAogICAgIG1hY3JvKE5ld1R5cGVkQXJyYXksIE5vZGVSZXN1bHRKUyB8IE5vZGVDbG9i YmVyc1dvcmxkIHwgTm9kZU11c3RHZW5lcmF0ZSkgXAogICAgIG1hY3JvKE5ld1JlZ2V4cCwgTm9k ZVJlc3VsdEpTKSBcCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1N0cmVuZ3Ro UmVkdWN0aW9uUGhhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHU3RyZW5ndGhSZWR1Y3Rpb25QaGFzZS5jcHAJKHJldmlzaW9uIDE3MTE5MikKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3RyZW5ndGhSZWR1Y3Rpb25QaGFzZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTIyMSwxNCArMjIxLDU2IEBAIHByaXZhdGU6CiAgICAgICAgICAgICBO b2RlKiBzZXRMb2NhbCA9IG51bGxwdHI7CiAgICAgICAgICAgICBWaXJ0dWFsUmVnaXN0ZXIgbG9j YWwgPSBtX25vZGUtPmxvY2FsKCk7CiAgICAgICAgICAgICAKLSAgICAgICAgICAgIGZvciAodW5z aWduZWQgaSA9IG1fbm9kZUluZGV4OyBpLS07KSB7Ci0gICAgICAgICAgICAgICAgTm9kZSogbm9k ZSA9IG1fYmxvY2stPmF0KGkpOwotICAgICAgICAgICAgICAgIGlmIChub2RlLT5vcCgpID09IFNl dExvY2FsICYmIG5vZGUtPmxvY2FsKCkgPT0gbG9jYWwpIHsKLSAgICAgICAgICAgICAgICAgICAg c2V0TG9jYWwgPSBub2RlOwotICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAg IGlmIChtX25vZGUtPnZhcmlhYmxlQWNjZXNzRGF0YSgpLT5pc0NhcHR1cmVkKCkpIHsKKyAgICAg ICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSBtX25vZGVJbmRleDsgaS0tOykgeworICAgICAg ICAgICAgICAgICAgICBOb2RlKiBub2RlID0gbV9ibG9jay0+YXQoaSk7CisgICAgICAgICAgICAg ICAgICAgIGJvb2wgZG9uZSA9IGZhbHNlOworICAgICAgICAgICAgICAgICAgICBzd2l0Y2ggKG5v ZGUtPm9wKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgY2FzZSBHZXRMb2NhbDoKKyAgICAgICAg ICAgICAgICAgICAgY2FzZSBGbHVzaDoKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChub2Rl LT5sb2NhbCgpID09IGxvY2FsKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRvbmUgPSB0 cnVlOworICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgCisg ICAgICAgICAgICAgICAgICAgIGNhc2UgR2V0TG9jYWxVbmxpbmtlZDoKKyAgICAgICAgICAgICAg ICAgICAgICAgIGlmIChub2RlLT51bmxpbmtlZExvY2FsKCkgPT0gbG9jYWwpCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZG9uZSA9IHRydWU7CisgICAgICAgICAgICAgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICAgICAgY2FzZSBTZXRMb2Nh bDogeworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKG5vZGUtPmxvY2FsKCkgIT0gbG9jYWwp CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgICAg ICAgICBzZXRMb2NhbCA9IG5vZGU7CisgICAgICAgICAgICAgICAgICAgICAgICBkb25lID0gdHJ1 ZTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICB9 CisgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICAgICAgIGNhc2UgUGhhbnRvbToKKyAg ICAgICAgICAgICAgICAgICAgY2FzZSBDaGVjazoKKyAgICAgICAgICAgICAgICAgICAgY2FzZSBI YXJkUGhhbnRvbToKKyAgICAgICAgICAgICAgICAgICAgY2FzZSBNb3ZIaW50OgorICAgICAgICAg ICAgICAgICAgICBjYXNlIEpTQ29uc3RhbnQ6CisgICAgICAgICAgICAgICAgICAgIGNhc2UgRG91 YmxlQ29uc3RhbnQ6CisgICAgICAgICAgICAgICAgICAgIGNhc2UgSW50NTJDb25zdGFudDoKKyAg ICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIAorICAgICAgICAg ICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgICAgICAgICAgZG9uZSA9IHRydWU7 CisgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgfQor ICAgICAgICAgICAgICAgICAgICBpZiAoZG9uZSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGJy ZWFrOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAg ICAgICAgZm9yICh1bnNpZ25lZCBpID0gbV9ub2RlSW5kZXg7IGktLTspIHsKKyAgICAgICAgICAg ICAgICAgICAgTm9kZSogbm9kZSA9IG1fYmxvY2stPmF0KGkpOworICAgICAgICAgICAgICAgICAg ICBpZiAobm9kZS0+b3AoKSA9PSBTZXRMb2NhbCAmJiBub2RlLT5sb2NhbCgpID09IGxvY2FsKSB7 CisgICAgICAgICAgICAgICAgICAgICAgICBzZXRMb2NhbCA9IG5vZGU7CisgICAgICAgICAgICAg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAg ICAgICBpZiAoYWNjZXNzZXNPdmVybGFwKG1fZ3JhcGgsIG5vZGUsIEFic3RyYWN0SGVhcChWYXJp YWJsZXMsIGxvY2FsKSkpCisgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICAgICAgaWYgKGFjY2Vzc2VzT3ZlcmxhcChtX2dyYXBoLCBu b2RlLCBBYnN0cmFjdEhlYXAoVmFyaWFibGVzLCBsb2NhbCkpKQotICAgICAgICAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIAogICAgICAgICAgICAgaWYgKCFz ZXRMb2NhbCkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvY2FwdHVy ZS1lc2NhcGUtYW5kLXRocm93LmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS90ZXN0cy9zdHJlc3MvY2FwdHVyZS1lc2NhcGUtYW5kLXRocm93LmpzCShyZXZpc2lvbiAwKQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy9jYXB0dXJlLWVzY2FwZS1hbmQt dGhyb3cuanMJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwyOCBAQAordmFyIGY7CisKK2Z1bmN0 aW9uIGZvbyhzKSB7CisgICAgdmFyIHggPSAxOworICAgIGYgPSBmdW5jdGlvbigpIHsgcmV0dXJu IHg7IH07CisgICAgeCA9IDI7CisgICAgbmV3IEFycmF5KHMpOworICAgIHggPSAzOworfQorCitu b0lubGluZShmb28pOworCitmb3IgKHZhciBpID0gMDsgaSA8IDEwMDAwOyArK2kpCisgICAgZm9v KDEpOworCit2YXIgZGlkVGhyb3cgPSBmYWxzZTsKK3RyeSB7CisgICAgZm9vKC0xKTsKK30gY2F0 Y2ggKGUpIHsKKyAgICBkaWRUaHJvdyA9IGU7Cit9CisKK2lmICgoIiIgKyBkaWRUaHJvdykuaW5k ZXhPZigiUmFuZ2VFcnJvciIpICE9IDApCisgICAgdGhyb3cgIkVycm9yOiBkaWQgbm90IHRocm93 IHJpZ2h0IGV4Y2VwdGlvbjogIiArIGRpZFRocm93OworCit2YXIgcmVzdWx0ID0gZigpOworaWYg KHJlc3VsdCAhPSAyKQorICAgIHRocm93ICJFcnJvcjogYmFkIHJlc3VsdCBmcm9tIGYoKTogIiAr IHJlc3VsdDsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvbmV3LWFy cmF5LXdpdGgtc2l6ZS10aHJvdy1leGNlcHRpb24tYW5kLXRlYXItb2ZmLWFyZ3VtZW50cy5qcwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvc3RyZXNzL25ldy1hcnJh eS13aXRoLXNpemUtdGhyb3ctZXhjZXB0aW9uLWFuZC10ZWFyLW9mZi1hcmd1bWVudHMuanMJKHJl dmlzaW9uIDApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvc3RyZXNzL25ldy1hcnJh eS13aXRoLXNpemUtdGhyb3ctZXhjZXB0aW9uLWFuZC10ZWFyLW9mZi1hcmd1bWVudHMuanMJKHdv cmtpbmcgY29weSkKQEAgLTAsMCArMSwyNiBAQAorZnVuY3Rpb24gZm9vKCkgeworICAgIHZhciBh ID0gYXJndW1lbnRzOworICAgIHJldHVybiBuZXcgQXJyYXkoYVswXSk7Cit9CisKK2Z1bmN0aW9u IGJhcih4KSB7CisgICAgcmV0dXJuIGZvbyh4KTsKK30KKworbm9JbmxpbmUoYmFyKTsKKworZm9y ICh2YXIgaSA9IDA7IGkgPCAxMDAwMDsgKytpKSB7CisgICAgdmFyIHJlc3VsdCA9IGJhcig0Mik7 CisgICAgaWYgKHJlc3VsdC5sZW5ndGggIT0gNDIpCisgICAgICAgIHRocm93ICJFcnJvcjogYmFk IHJlc3VsdCBsZW5ndGg6ICIgKyByZXN1bHQ7Cit9CisKK3ZhciBkaWRUaHJvdyA9IGZhbHNlOwor dHJ5IHsKKyAgICBiYXIoLTEpOworfSBjYXRjaCAoZSkgeworICAgIGRpZFRocm93ID0gZTsKK30K KworaWYgKCgiIiArIGRpZFRocm93KS5pbmRleE9mKCJSYW5nZUVycm9yIikgIT0gMCkKKyAgICB0 aHJvdyAiRXJyb3I6IGRpZCBub3QgdGhyb3cgcmlnaHQgZXhjZXB0aW9uOiAiICsgZGlkVGhyb3c7 Cg==