111619 2013-03-06 13:37:02 -0800 DFG::AbstractState::merge() is still more complicated than it needs to be 2013-03-06 15:16:21 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED INVALID P2 Normal --- 111539 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 849254 0 fpizlo 2013-03-06 13:37:02 -0800 Patch forthcoming. 849260 1 191823 fpizlo 2013-03-06 13:40:07 -0800 Created attachment 191823 the patch 849267 2 191823 mhahnenberg 2013-03-06 13:44:36 -0800 Comment on attachment 191823 the patch r=me 849337 3 191839 fpizlo 2013-03-06 14:59:54 -0800 Created attachment 191839 the patch 849339 4 191839 mhahnenberg 2013-03-06 15:01:19 -0800 Comment on attachment 191839 the patch r=me 849349 5 fpizlo 2013-03-06 15:06:31 -0800 Landed in http://trac.webkit.org/changeset/144989 849356 6 fpizlo 2013-03-06 15:15:17 -0800 Actually, this is wrong. 849357 7 fpizlo 2013-03-06 15:16:21 -0800 Rolled out in http://trac.webkit.org/changeset/144991 191823 2013-03-06 13:40:07 -0800 2013-03-06 14:59:54 -0800 the patch blah.patch text/plain 3572 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTQ0OTc1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBA CisyMDEzLTAzLTA2ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHOjpBYnN0cmFjdFN0YXRlOjptZXJnZSgpIGlzIHN0aWxsIG1vcmUgY29tcGxpY2F0ZWQgdGhh biBpdCBuZWVkcyB0byBiZSwgYmVjYXVzZSBpdCBzdGlsbCB0aGlua3MgdGhhdCBpdCdzIGRvaW5n IGxpdmVuZXNzIHBydW5pbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMTYxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor ICAgICAgICAKKyAgICAgICAgVGhlcmUgaXMgbm8gbmVlZCB0byBkbyBsaXZlbmVzcyBwcnVuaW5n LiBJdCdzIG5vdCBwcm9maXRhYmxlIGFuZCBpdCBtYWtlcyB0aGUgY29kZSBtb3JlIGNvbXBsaWNh dGVkLgorCisgICAgICAgICogZGZnL0RGR0Fic3RyYWN0U3RhdGUuY3BwOgorICAgICAgICAoSlND OjpERkc6OkFic3RyYWN0U3RhdGU6Om1lcmdlKToKKyAgICAgICAgKERGRyk6CisgICAgICAgICog ZGZnL0RGR0Fic3RyYWN0U3RhdGUuaDoKKyAgICAgICAgKEFic3RyYWN0U3RhdGUpOgorCiAyMDEz LTAzLTA2ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAgICAgREZHIHNo b3VsZCBub3QgcnVuIGZ1bGwgQ1NFIGFmdGVyIHRoZSBvcHRpbWl6YXRpb24gZml4cG9pbnQsIHNp bmNlIGl0IHJlYWxseSBqdXN0IHdhbnRzIHN0b3JlIGVsaW1pbmF0aW9uCkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0U3RhdGUuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQWJzdHJhY3RTdGF0ZS5jcHAJKHJldmlzaW9uIDE0 NDk3MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQWJzdHJhY3RTdGF0ZS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTE2OTYsMTUgKzE2OTYsMTEgQEAgaW5saW5lIGJvb2wgQWJzdHJh Y3RTdGF0ZTo6bWVyZ2UoQmFzaWNCbAogICAgIAogICAgIGJvb2wgY2hhbmdlZCA9IGZhbHNlOwog ICAgIAotICAgIGZvciAoc2l6ZV90IGFyZ3VtZW50ID0gMDsgYXJndW1lbnQgPCBmcm9tLT52YXJp YWJsZXNBdFRhaWwubnVtYmVyT2ZBcmd1bWVudHMoKTsgKythcmd1bWVudCkgewotICAgICAgICBB YnN0cmFjdFZhbHVlJiBkZXN0aW5hdGlvbiA9IHRvLT52YWx1ZXNBdEhlYWQuYXJndW1lbnQoYXJn dW1lbnQpOwotICAgICAgICBjaGFuZ2VkIHw9IG1lcmdlVmFyaWFibGVCZXR3ZWVuQmxvY2tzKGRl c3RpbmF0aW9uLCBmcm9tLT52YWx1ZXNBdFRhaWwuYXJndW1lbnQoYXJndW1lbnQpLCB0by0+dmFy aWFibGVzQXRIZWFkLmFyZ3VtZW50KGFyZ3VtZW50KSwgZnJvbS0+dmFyaWFibGVzQXRUYWlsLmFy Z3VtZW50KGFyZ3VtZW50KSk7Ci0gICAgfQorICAgIGZvciAoc2l6ZV90IGFyZ3VtZW50ID0gMDsg YXJndW1lbnQgPCBmcm9tLT52YXJpYWJsZXNBdFRhaWwubnVtYmVyT2ZBcmd1bWVudHMoKTsgKyth cmd1bWVudCkKKyAgICAgICAgY2hhbmdlZCB8PSB0by0+dmFsdWVzQXRIZWFkLmFyZ3VtZW50KGFy Z3VtZW50KS5tZXJnZShmcm9tLT52YWx1ZXNBdFRhaWwuYXJndW1lbnQoYXJndW1lbnQpKTsKICAg ICAKLSAgICBmb3IgKHNpemVfdCBsb2NhbCA9IDA7IGxvY2FsIDwgZnJvbS0+dmFyaWFibGVzQXRU YWlsLm51bWJlck9mTG9jYWxzKCk7ICsrbG9jYWwpIHsKLSAgICAgICAgQWJzdHJhY3RWYWx1ZSYg ZGVzdGluYXRpb24gPSB0by0+dmFsdWVzQXRIZWFkLmxvY2FsKGxvY2FsKTsKLSAgICAgICAgY2hh bmdlZCB8PSBtZXJnZVZhcmlhYmxlQmV0d2VlbkJsb2NrcyhkZXN0aW5hdGlvbiwgZnJvbS0+dmFs dWVzQXRUYWlsLmxvY2FsKGxvY2FsKSwgdG8tPnZhcmlhYmxlc0F0SGVhZC5sb2NhbChsb2NhbCks IGZyb20tPnZhcmlhYmxlc0F0VGFpbC5sb2NhbChsb2NhbCkpOwotICAgIH0KKyAgICBmb3IgKHNp emVfdCBsb2NhbCA9IDA7IGxvY2FsIDwgZnJvbS0+dmFyaWFibGVzQXRUYWlsLm51bWJlck9mTG9j YWxzKCk7ICsrbG9jYWwpCisgICAgICAgIGNoYW5nZWQgfD0gdG8tPnZhbHVlc0F0SGVhZC5sb2Nh bChsb2NhbCkubWVyZ2UoZnJvbS0+dmFsdWVzQXRUYWlsLmxvY2FsKGxvY2FsKSk7CiAKICAgICBp ZiAoIXRvLT5jZmFIYXNWaXNpdGVkKQogICAgICAgICBjaGFuZ2VkID0gdHJ1ZTsKQEAgLTE3NTcs MTggKzE3NTMsNiBAQCBpbmxpbmUgYm9vbCBBYnN0cmFjdFN0YXRlOjptZXJnZVRvU3VjY2VzCiAg ICAgfQogfQogCi1pbmxpbmUgYm9vbCBBYnN0cmFjdFN0YXRlOjptZXJnZVZhcmlhYmxlQmV0d2Vl bkJsb2NrcyhBYnN0cmFjdFZhbHVlJiBkZXN0aW5hdGlvbiwgQWJzdHJhY3RWYWx1ZSYgc291cmNl LCBOb2RlKiBkZXN0aW5hdGlvbk5vZGUsIE5vZGUqIHNvdXJjZU5vZGUpCi17Ci0gICAgaWYgKCFk ZXN0aW5hdGlvbk5vZGUpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAKLSAgICBBU1NFUlRf VU5VU0VEKHNvdXJjZU5vZGUsIHNvdXJjZU5vZGUpOwotICAgIAotICAgIC8vIEZJWE1FOiBXZSBj b3VsZCBkbyBzb21lIHNwYXJzZSBjb25kaXRpb25hbCBwcm9wYWdhdGlvbiBoZXJlIQotICAgIAot ICAgIHJldHVybiBkZXN0aW5hdGlvbi5tZXJnZShzb3VyY2UpOwotfQotCiB2b2lkIEFic3RyYWN0 U3RhdGU6OmR1bXAoUHJpbnRTdHJlYW0mIG91dCkKIHsKICAgICBib29sIGZpcnN0ID0gdHJ1ZTsK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQWJzdHJhY3RTdGF0ZS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQWJzdHJhY3RTdGF0ZS5oCShy ZXZpc2lvbiAxNDQ5NzMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0 U3RhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtMjM0LDggKzIzNCw2IEBAIHByaXZhdGU6CiAgICAg CiAgICAgYm9vbCBtZXJnZVN0YXRlQXRUYWlsKEFic3RyYWN0VmFsdWUmIGRlc3RpbmF0aW9uLCBB YnN0cmFjdFZhbHVlJiBpblZhcmlhYmxlLCBOb2RlKik7CiAgICAgCi0gICAgc3RhdGljIGJvb2wg bWVyZ2VWYXJpYWJsZUJldHdlZW5CbG9ja3MoQWJzdHJhY3RWYWx1ZSYgZGVzdGluYXRpb24sIEFi c3RyYWN0VmFsdWUmIHNvdXJjZSwgTm9kZSogZGVzdGluYXRpb25Ob2RlLCBOb2RlKiBzb3VyY2VO b2RlKTsKLSAgICAKICAgICBlbnVtIEJvb2xlYW5SZXN1bHQgewogICAgICAgICBVbmtub3duQm9v bGVhblJlc3VsdCwKICAgICAgICAgRGVmaW5pdGVseUZhbHNlLAo= 191839 2013-03-06 14:59:54 -0800 2013-03-06 15:01:19 -0800 the patch blah.patch text/plain 3993 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTQ0OTg3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBA CisyMDEzLTAzLTA2ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHOjpBYnN0cmFjdFN0YXRlOjptZXJnZSgpIGlzIHN0aWxsIG1vcmUgY29tcGxpY2F0ZWQgdGhh biBpdCBuZWVkcyB0byBiZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTExNjE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisg ICAgICAgIAorICAgICAgICBUaGlzIG1ldGhvZCBpcyB0aGUgb25lIHBsYWNlIHdoZXJlIHdlIHN0 aWxsIGRvIHNvbWUgbWluaW1hbCBhbW91bnQgb2YgbGl2ZW5lc3MgcHJ1bmluZywgYnV0IHRoZSBz dHlsZSB3aXRoCisgICAgICAgIHdoaWNoIGl0IGlzIHdyaXR0ZW4gaXMgYXdrd2FyZCwgYW5kIGl0 IG1ha2VzIGFuIGFzc2VydGlvbiBhYm91dCB2YXJpYWJsZXNBdFRhaWwgdGhhdCB3aWxsIGJlIGlu dmFsaWRhdGVkCisgICAgICAgIGJ5IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTE1MzkuCisKKyAgICAgICAgKiBkZmcvREZHQWJzdHJhY3RTdGF0ZS5jcHA6CisgICAg ICAgIChKU0M6OkRGRzo6QWJzdHJhY3RTdGF0ZTo6bWVyZ2UpOgorICAgICAgICAoSlNDOjpERkc6 OkFic3RyYWN0U3RhdGU6Om1lcmdlVmFyaWFibGVCZXR3ZWVuQmxvY2tzKToKKyAgICAgICAgKiBk ZmcvREZHQWJzdHJhY3RTdGF0ZS5oOgorICAgICAgICAoQWJzdHJhY3RTdGF0ZSk6CisKIDIwMTMt MDMtMDYgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBERkcgc2hv dWxkIG5vdCBydW4gZnVsbCBDU0UgYWZ0ZXIgdGhlIG9wdGltaXphdGlvbiBmaXhwb2ludCwgc2lu Y2UgaXQgcmVhbGx5IGp1c3Qgd2FudHMgc3RvcmUgZWxpbWluYXRpb24KSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHQWJzdHJhY3RTdGF0ZS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdFN0YXRlLmNwcAkocmV2aXNpb24gMTQ0 OTczKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdFN0YXRlLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTY5NywxMyArMTY5NywxNyBAQCBpbmxpbmUgYm9vbCBBYnN0cmFj dFN0YXRlOjptZXJnZShCYXNpY0JsCiAgICAgYm9vbCBjaGFuZ2VkID0gZmFsc2U7CiAgICAgCiAg ICAgZm9yIChzaXplX3QgYXJndW1lbnQgPSAwOyBhcmd1bWVudCA8IGZyb20tPnZhcmlhYmxlc0F0 VGFpbC5udW1iZXJPZkFyZ3VtZW50cygpOyArK2FyZ3VtZW50KSB7Ci0gICAgICAgIEFic3RyYWN0 VmFsdWUmIGRlc3RpbmF0aW9uID0gdG8tPnZhbHVlc0F0SGVhZC5hcmd1bWVudChhcmd1bWVudCk7 Ci0gICAgICAgIGNoYW5nZWQgfD0gbWVyZ2VWYXJpYWJsZUJldHdlZW5CbG9ja3MoZGVzdGluYXRp b24sIGZyb20tPnZhbHVlc0F0VGFpbC5hcmd1bWVudChhcmd1bWVudCksIHRvLT52YXJpYWJsZXNB dEhlYWQuYXJndW1lbnQoYXJndW1lbnQpLCBmcm9tLT52YXJpYWJsZXNBdFRhaWwuYXJndW1lbnQo YXJndW1lbnQpKTsKKyAgICAgICAgY2hhbmdlZCB8PSBtZXJnZVZhcmlhYmxlQmV0d2VlbkJsb2Nr cygKKyAgICAgICAgICAgIHRvLT52YWx1ZXNBdEhlYWQuYXJndW1lbnQoYXJndW1lbnQpLAorICAg ICAgICAgICAgZnJvbS0+dmFsdWVzQXRUYWlsLmFyZ3VtZW50KGFyZ3VtZW50KSwKKyAgICAgICAg ICAgIHRvLT52YXJpYWJsZXNBdEhlYWQuYXJndW1lbnQoYXJndW1lbnQpKTsKICAgICB9CiAgICAg CiAgICAgZm9yIChzaXplX3QgbG9jYWwgPSAwOyBsb2NhbCA8IGZyb20tPnZhcmlhYmxlc0F0VGFp bC5udW1iZXJPZkxvY2FscygpOyArK2xvY2FsKSB7Ci0gICAgICAgIEFic3RyYWN0VmFsdWUmIGRl c3RpbmF0aW9uID0gdG8tPnZhbHVlc0F0SGVhZC5sb2NhbChsb2NhbCk7Ci0gICAgICAgIGNoYW5n ZWQgfD0gbWVyZ2VWYXJpYWJsZUJldHdlZW5CbG9ja3MoZGVzdGluYXRpb24sIGZyb20tPnZhbHVl c0F0VGFpbC5sb2NhbChsb2NhbCksIHRvLT52YXJpYWJsZXNBdEhlYWQubG9jYWwobG9jYWwpLCBm cm9tLT52YXJpYWJsZXNBdFRhaWwubG9jYWwobG9jYWwpKTsKKyAgICAgICAgY2hhbmdlZCB8PSBt ZXJnZVZhcmlhYmxlQmV0d2VlbkJsb2NrcygKKyAgICAgICAgICAgIHRvLT52YWx1ZXNBdEhlYWQu bG9jYWwobG9jYWwpLAorICAgICAgICAgICAgZnJvbS0+dmFsdWVzQXRUYWlsLmxvY2FsKGxvY2Fs KSwKKyAgICAgICAgICAgIHRvLT52YXJpYWJsZXNBdEhlYWQubG9jYWwobG9jYWwpKTsKICAgICB9 CiAKICAgICBpZiAoIXRvLT5jZmFIYXNWaXNpdGVkKQpAQCAtMTc1NywxNSArMTc2MSwxMiBAQCBp bmxpbmUgYm9vbCBBYnN0cmFjdFN0YXRlOjptZXJnZVRvU3VjY2VzCiAgICAgfQogfQogCi1pbmxp bmUgYm9vbCBBYnN0cmFjdFN0YXRlOjptZXJnZVZhcmlhYmxlQmV0d2VlbkJsb2NrcyhBYnN0cmFj dFZhbHVlJiBkZXN0aW5hdGlvbiwgQWJzdHJhY3RWYWx1ZSYgc291cmNlLCBOb2RlKiBkZXN0aW5h dGlvbk5vZGUsIE5vZGUqIHNvdXJjZU5vZGUpCitpbmxpbmUgYm9vbCBBYnN0cmFjdFN0YXRlOjpt ZXJnZVZhcmlhYmxlQmV0d2VlbkJsb2NrcyhBYnN0cmFjdFZhbHVlJiBkZXN0aW5hdGlvbiwgQWJz dHJhY3RWYWx1ZSYgc291cmNlLCBOb2RlKiBkZXN0aW5hdGlvbk5vZGUpCiB7CisgICAgLy8gVGhp cyBpcyB0aGUgb25seSBsaXZlbmVzcyBwcnVuaW5nIHRoYXQgd2UgZG8uIFdlIGNhbiBhbHdheXMg cmVseSBvbiB0aGUgbGl2ZW5lc3MgYXQgaGVhZCB0byBiZSBwcmVzZXJ2ZWQuCiAgICAgaWYgKCFk ZXN0aW5hdGlvbk5vZGUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAKLSAgICBBU1NFUlRf VU5VU0VEKHNvdXJjZU5vZGUsIHNvdXJjZU5vZGUpOwotICAgIAotICAgIC8vIEZJWE1FOiBXZSBj b3VsZCBkbyBzb21lIHNwYXJzZSBjb25kaXRpb25hbCBwcm9wYWdhdGlvbiBoZXJlIQotICAgIAog ICAgIHJldHVybiBkZXN0aW5hdGlvbi5tZXJnZShzb3VyY2UpOwogfQogCkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0U3RhdGUuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0U3RhdGUuaAkocmV2aXNpb24gMTQ0OTcz KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdFN0YXRlLmgJKHdvcmtp bmcgY29weSkKQEAgLTIzNCw3ICsyMzQsNyBAQCBwcml2YXRlOgogICAgIAogICAgIGJvb2wgbWVy Z2VTdGF0ZUF0VGFpbChBYnN0cmFjdFZhbHVlJiBkZXN0aW5hdGlvbiwgQWJzdHJhY3RWYWx1ZSYg aW5WYXJpYWJsZSwgTm9kZSopOwogICAgIAotICAgIHN0YXRpYyBib29sIG1lcmdlVmFyaWFibGVC ZXR3ZWVuQmxvY2tzKEFic3RyYWN0VmFsdWUmIGRlc3RpbmF0aW9uLCBBYnN0cmFjdFZhbHVlJiBz b3VyY2UsIE5vZGUqIGRlc3RpbmF0aW9uTm9kZSwgTm9kZSogc291cmNlTm9kZSk7CisgICAgc3Rh dGljIGJvb2wgbWVyZ2VWYXJpYWJsZUJldHdlZW5CbG9ja3MoQWJzdHJhY3RWYWx1ZSYgZGVzdGlu YXRpb24sIEFic3RyYWN0VmFsdWUmIHNvdXJjZSwgTm9kZSogZGVzdGluYXRpb25Ob2RlKTsKICAg ICAKICAgICBlbnVtIEJvb2xlYW5SZXN1bHQgewogICAgICAgICBVbmtub3duQm9vbGVhblJlc3Vs dCwK