95141 2012-08-27 15:37:05 -0700 Structure check hoisting should abstain if the OSR entry's must-handle value for the respective variable has a different structure 2012-08-28 11:01:06 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 fpizlo fpizlo barraclough ggaren mhahnenberg msaboff oliver oldest_to_newest 705781 0 fpizlo 2012-08-27 15:37:05 -0700 Patch forthcoming. <rdar://problem/12170401> 705785 1 160828 fpizlo 2012-08-27 15:38:23 -0700 Created attachment 160828 the patch 705791 2 160828 mhahnenberg 2012-08-27 15:42:49 -0700 Comment on attachment 160828 the patch A test would be nice. Looks good otherwise. 705922 3 fpizlo 2012-08-27 17:40:47 -0700 Landed in http://trac.webkit.org/changeset/126826 706518 4 fpizlo 2012-08-28 11:01:06 -0700 (In reply to comment #2) > (From update of attachment 160828 [details]) > A test would be nice. Looks good otherwise. I tried to come up with a test. But that requires perfect timing to make something evil happen right at the time that OSR kicks in. I decided that even if I succeeded in making such a test, it would be extremely fragile and probably not worth it. 160828 2012-08-27 15:38:23 -0700 2012-08-27 15:42:49 -0700 the patch fixhoist_patch_1.diff text/plain 3577 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTI2ODA4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBA CisyMDEyLTA4LTI3ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg U3RydWN0dXJlIGNoZWNrIGhvaXN0aW5nIHNob3VsZCBhYnN0YWluIGlmIHRoZSBPU1IgZW50cnkn cyBtdXN0LWhhbmRsZSB2YWx1ZSBmb3IgdGhlIHJlc3BlY3RpdmUgdmFyaWFibGUgaGFzIGEgZGlm ZmVyZW50IHN0cnVjdHVyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTUxNDEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEyMTcwNDAxPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZGZnL0RGR1N0cnVj dHVyZUNoZWNrSG9pc3RpbmdQaGFzZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3RydWN0dXJl Q2hlY2tIb2lzdGluZ1BoYXNlOjpydW4pOgorCiAyMDEyLTA4LTI3ICBNYXJrIEhhaG5lbmJlcmcg IDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHVzZXMgb2YgVHlwZWRB cnJheSBDbGFzc0luZm8gZnJvbSBTcGVjdWxhdGl2ZUpJVDo6Y2hlY2tBcmd1bWVudFR5cGVzCklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1N0cnVjdHVyZUNoZWNrSG9pc3RpbmdQ aGFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTdHJ1 Y3R1cmVDaGVja0hvaXN0aW5nUGhhc2UuY3BwCShyZXZpc2lvbiAxMjY4MDYpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR1N0cnVjdHVyZUNoZWNrSG9pc3RpbmdQaGFzZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTEzMCw2ICsxMzAsNTAgQEAgcHVibGljOgogI2VuZGlmCiAgICAgICAg ICAgICBpdGVyLT5zZWNvbmQubV9zdHJ1Y3R1cmUgPSAwOwogICAgICAgICB9CisgICAgICAgIAor ICAgICAgICAvLyBEaXNhYmxlIHN0cnVjdHVyZSBjaGVjayBob2lzdGluZyBmb3IgdmFyaWFibGVz IHRoYXQgY3Jvc3MgdGhlIE9TUiBlbnRyeSB0aGF0CisgICAgICAgIC8vIHdlJ3JlIGN1cnJlbnRs eSB0YWtpbmcsIGFuZCB3aGVyZSB0aGUgdmFsdWUgY3VycmVudGx5IGRvZXMgbm90IGhhdmUgdGhl CisgICAgICAgIC8vIHN0cnVjdHVyZSB3ZSB3YW50LgorICAgICAgICAKKyAgICAgICAgZm9yIChC bG9ja0luZGV4IGJsb2NrSW5kZXggPSAwOyBibG9ja0luZGV4IDwgbV9ncmFwaC5tX2Jsb2Nrcy5z aXplKCk7ICsrYmxvY2tJbmRleCkgeworICAgICAgICAgICAgQmFzaWNCbG9jayogYmxvY2sgPSBt X2dyYXBoLm1fYmxvY2tzW2Jsb2NrSW5kZXhdLmdldCgpOworICAgICAgICAgICAgaWYgKCFibG9j aykKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIEFTU0VSVChibG9jay0+ aXNSZWFjaGFibGUpOworICAgICAgICAgICAgaWYgKCFibG9jay0+aXNPU1JUYXJnZXQpCisgICAg ICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICBpZiAoYmxvY2stPmJ5dGVjb2RlQmVn aW4gIT0gbV9ncmFwaC5tX29zckVudHJ5Qnl0ZWNvZGVJbmRleCkKKyAgICAgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9ncmFwaC5tX211 c3RIYW5kbGVWYWx1ZXMuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgICAgICAgICBpbnQgb3BlcmFu ZCA9IG1fZ3JhcGgubV9tdXN0SGFuZGxlVmFsdWVzLm9wZXJhbmRGb3JJbmRleChpKTsKKyAgICAg ICAgICAgICAgICBOb2RlSW5kZXggbm9kZUluZGV4ID0gYmxvY2stPnZhcmlhYmxlc0F0SGVhZC5v cGVyYW5kKG9wZXJhbmQpOworICAgICAgICAgICAgICAgIGlmIChub2RlSW5kZXggPT0gTm9Ob2Rl KQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgICAgICBWYXJpYWJs ZUFjY2Vzc0RhdGEqIHZhcmlhYmxlID0gbV9ncmFwaFtub2RlSW5kZXhdLnZhcmlhYmxlQWNjZXNz RGF0YSgpOworICAgICAgICAgICAgICAgIEhhc2hNYXA8VmFyaWFibGVBY2Nlc3NEYXRhKiwgQ2hl Y2tEYXRhPjo6aXRlcmF0b3IgaXRlciA9IG1fbWFwLmZpbmQodmFyaWFibGUpOworICAgICAgICAg ICAgICAgIGlmIChpdGVyID09IG1fbWFwLmVuZCgpKQorICAgICAgICAgICAgICAgICAgICBjb250 aW51ZTsKKyAgICAgICAgICAgICAgICBpZiAoIWl0ZXItPnNlY29uZC5tX3N0cnVjdHVyZSkKKyAg ICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgSlNWYWx1ZSB2YWx1 ZSA9IG1fZ3JhcGgubV9tdXN0SGFuZGxlVmFsdWVzW2ldOworICAgICAgICAgICAgICAgIGlmICgh dmFsdWUgfHwgIXZhbHVlLmlzQ2VsbCgpKSB7CisjaWYgREZHX0VOQUJMRShERUJVR19QUk9QQUdB VElPTl9WRVJCT1NFKQorICAgICAgICAgICAgICAgICAgICBkYXRhTG9nKCJaZXJvaW5nIHRoZSBz dHJ1Y3R1cmUgdG8gaG9pc3QgZm9yICVzIGJlY2F1c2UgdGhlIE9TUiBlbnRyeSB2YWx1ZSBpcyBu b3QgYSBjZWxsOiAlcy5cbiIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9ncmFwaC5u YW1lT2ZWYXJpYWJsZUFjY2Vzc0RhdGEodmFyaWFibGUpLCB2YWx1ZS5kZXNjcmlwdGlvbigpKTsK KyNlbmRpZgorICAgICAgICAgICAgICAgICAgICBpdGVyLT5zZWNvbmQubV9zdHJ1Y3R1cmUgPSAw OworICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgICAgaWYgKHZhbHVlLmFzQ2VsbCgpLT5zdHJ1Y3R1cmUoKSAhPSBpdGVyLT5zZWNv bmQubV9zdHJ1Y3R1cmUpIHsKKyNpZiBERkdfRU5BQkxFKERFQlVHX1BST1BBR0FUSU9OX1ZFUkJP U0UpCisgICAgICAgICAgICAgICAgICAgIGRhdGFMb2coIlplcm9pbmcgdGhlIHN0cnVjdHVyZSB0 byBob2lzdCBmb3IgJXMgYmVjYXVzZSB0aGUgT1NSIGVudHJ5IHZhbHVlIGhhcyBzdHJ1Y3R1cmUg JXAgYW5kIHdlIHdhbnRlZCAlcC5cbiIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9n cmFwaC5uYW1lT2ZWYXJpYWJsZUFjY2Vzc0RhdGEodmFyaWFibGUpLCB2YWx1ZS5hc0NlbGwoKS0+ c3RydWN0dXJlKCksIGl0ZXItPnNlY29uZC5tX3N0cnVjdHVyZSk7CisjZW5kaWYKKyAgICAgICAg ICAgICAgICAgICAgaXRlci0+c2Vjb25kLm1fc3RydWN0dXJlID0gMDsKKyAgICAgICAgICAgICAg ICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAg ICB9CiAKICAgICAgICAgLy8gSWRlbnRpZnkgdGhlIHNldCBvZiB2YXJpYWJsZXMgdGhhdCBhcmUg bGl2ZSBhY3Jvc3MgYSBzdHJ1Y3R1cmUgY2xvYmJlci4KICAgICAgICAgCg==