42867 2010-07-22 19:23:11 -0700 Do more constant folding 2010-07-22 20:25:14 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 oliver oliver oldest_to_newest 255162 0 oliver 2010-07-22 19:23:11 -0700 Do more constant folding 255163 1 62372 oliver 2010-07-22 19:24:48 -0700 Created attachment 62372 Patch 255165 2 62372 barraclough 2010-07-22 19:28:30 -0700 Comment on attachment 62372 Patch Have you perf tested? - assuming no regression, r+. 255182 3 oliver 2010-07-22 20:25:14 -0700 Committed r63946: <http://trac.webkit.org/changeset/63946> 62372 2010-07-22 19:24:48 -0700 2010-07-22 19:28:29 -0700 Patch bug-42867-20100722192447.patch text/plain 7407 oliver ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCA4YjdiNTUxN2JhMDdmZjc4ZDI3N2Y5Y2Q4Yjc5NDRhN2RkYmRiZjI3Li5i ZmQyOGVjZDdmY2Q2NzQ5MDU0MzkzMDE1ZTRhZTFiOGY0ZmEzOWEyIDEwMDY0NAotLS0gYS9KYXZh U2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjEgQEAKKzIwMTAtMDctMjIgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEbyBtb3Jl IGNvbnN0YW50IGZvbGRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQyODY3CisKKyAgICAgICAgQ29uc3RhbnQgZm9sZCBhIGZldyBtb3JlIG9wZXJh dGlvbnMuICBTdW5TcGlkZXIgc2F5cyB0aGlzIGlzCisgICAgICAgIGEgd2luIGJ1dCBJIHN1c3Bl Y3QgdGhhdCdzIGp1c3QgY29kZSBtb3Rpb24gYXQgcGxheS4KKworICAgICAgICAqIHBhcnNlci9B U1RCdWlsZGVyLmg6CisgICAgICAgIChKU0M6OkFTVEJ1aWxkZXI6Om1ha2VNb2ROb2RlKToKKyAg ICAgICAgKEpTQzo6QVNUQnVpbGRlcjo6bWFrZVVSaWdodFNoaWZ0Tm9kZSk6CisgICAgICAgIChK U0M6OkFTVEJ1aWxkZXI6Om1ha2VCaXRPck5vZGUpOgorICAgICAgICAoSlNDOjpBU1RCdWlsZGVy OjptYWtlQml0QW5kTm9kZSk6CisgICAgICAgIChKU0M6OkFTVEJ1aWxkZXI6Om1ha2VCaXRYT3JO b2RlKToKKyAgICAgICAgKEpTQzo6QVNUQnVpbGRlcjo6bWFrZUJpbmFyeU5vZGUpOgorCiAyMDEw LTA3LTIwICBNYWhlc2ggS3Vsa2FybmkgIDxtYWhlc2gua3Vsa2FybmlAbm9raWEuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IFN0ZXZlIEJsb2NrLgpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENv cmUvcGFyc2VyL0FTVEJ1aWxkZXIuaCBiL0phdmFTY3JpcHRDb3JlL3BhcnNlci9BU1RCdWlsZGVy LmgKaW5kZXggM2I3ZmZiNTVlODQ1YzQ3MzJhMjY5YmU5ZDYwZGUyMzg3NzRmYWE0ZS4uZjYyNzc1 NjNiOTYyYTZmMTlmZTQ1ODkyZTMxZThlMGY4NjVhYjNlZiAxMDA2NDQKLS0tIGEvSmF2YVNjcmlw dENvcmUvcGFyc2VyL0FTVEJ1aWxkZXIuaAorKysgYi9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvQVNU QnVpbGRlci5oCkBAIC0xMjQsMTAgKzEyNCwxNSBAQCBwdWJsaWM6CiAgICAgRXhwcmVzc2lvbk5v ZGUqIG1ha2VCaXR3aXNlTm90Tm9kZShFeHByZXNzaW9uTm9kZSopOwogICAgIEV4cHJlc3Npb25O b2RlKiBtYWtlTXVsdE5vZGUoRXhwcmVzc2lvbk5vZGUqIGxlZnQsIEV4cHJlc3Npb25Ob2RlKiBy aWdodCwgYm9vbCByaWdodEhhc0Fzc2lnbm1lbnRzKTsKICAgICBFeHByZXNzaW9uTm9kZSogbWFr ZURpdk5vZGUoRXhwcmVzc2lvbk5vZGUqIGxlZnQsIEV4cHJlc3Npb25Ob2RlKiByaWdodCwgYm9v bCByaWdodEhhc0Fzc2lnbm1lbnRzKTsKKyAgICBFeHByZXNzaW9uTm9kZSogbWFrZU1vZE5vZGUo RXhwcmVzc2lvbk5vZGUqIGxlZnQsIEV4cHJlc3Npb25Ob2RlKiByaWdodCwgYm9vbCByaWdodEhh c0Fzc2lnbm1lbnRzKTsKICAgICBFeHByZXNzaW9uTm9kZSogbWFrZUFkZE5vZGUoRXhwcmVzc2lv bk5vZGUqIGxlZnQsIEV4cHJlc3Npb25Ob2RlKiByaWdodCwgYm9vbCByaWdodEhhc0Fzc2lnbm1l bnRzKTsKICAgICBFeHByZXNzaW9uTm9kZSogbWFrZVN1Yk5vZGUoRXhwcmVzc2lvbk5vZGUqIGxl ZnQsIEV4cHJlc3Npb25Ob2RlKiByaWdodCwgYm9vbCByaWdodEhhc0Fzc2lnbm1lbnRzKTsKKyAg ICBFeHByZXNzaW9uTm9kZSogbWFrZUJpdFhPck5vZGUoRXhwcmVzc2lvbk5vZGUqIGxlZnQsIEV4 cHJlc3Npb25Ob2RlKiByaWdodCwgYm9vbCByaWdodEhhc0Fzc2lnbm1lbnRzKTsKKyAgICBFeHBy ZXNzaW9uTm9kZSogbWFrZUJpdEFuZE5vZGUoRXhwcmVzc2lvbk5vZGUqIGxlZnQsIEV4cHJlc3Np b25Ob2RlKiByaWdodCwgYm9vbCByaWdodEhhc0Fzc2lnbm1lbnRzKTsKKyAgICBFeHByZXNzaW9u Tm9kZSogbWFrZUJpdE9yTm9kZShFeHByZXNzaW9uTm9kZSogbGVmdCwgRXhwcmVzc2lvbk5vZGUq IHJpZ2h0LCBib29sIHJpZ2h0SGFzQXNzaWdubWVudHMpOwogICAgIEV4cHJlc3Npb25Ob2RlKiBt YWtlTGVmdFNoaWZ0Tm9kZShFeHByZXNzaW9uTm9kZSogbGVmdCwgRXhwcmVzc2lvbk5vZGUqIHJp Z2h0LCBib29sIHJpZ2h0SGFzQXNzaWdubWVudHMpOwogICAgIEV4cHJlc3Npb25Ob2RlKiBtYWtl UmlnaHRTaGlmdE5vZGUoRXhwcmVzc2lvbk5vZGUqIGxlZnQsIEV4cHJlc3Npb25Ob2RlKiByaWdo dCwgYm9vbCByaWdodEhhc0Fzc2lnbm1lbnRzKTsKKyAgICBFeHByZXNzaW9uTm9kZSogbWFrZVVS aWdodFNoaWZ0Tm9kZShFeHByZXNzaW9uTm9kZSogbGVmdCwgRXhwcmVzc2lvbk5vZGUqIHJpZ2h0 LCBib29sIHJpZ2h0SGFzQXNzaWdubWVudHMpOwogCiAgICAgRXhwcmVzc2lvbk5vZGUqIGNyZWF0 ZUxvZ2ljYWxOb3QoRXhwcmVzc2lvbk5vZGUqIGV4cHIpIHsgcmV0dXJuIG5ldyAobV9nbG9iYWxE YXRhKSBMb2dpY2FsTm90Tm9kZShtX2dsb2JhbERhdGEsIGV4cHIpOyB9CiAgICAgRXhwcmVzc2lv bk5vZGUqIGNyZWF0ZVVuYXJ5UGx1cyhFeHByZXNzaW9uTm9kZSogZXhwcikgeyByZXR1cm4gbmV3 IChtX2dsb2JhbERhdGEpIFVuYXJ5UGx1c05vZGUobV9nbG9iYWxEYXRhLCBleHByKTsgfQpAQCAt NjkwLDYgKzY5NSwxNiBAQCBFeHByZXNzaW9uTm9kZSogQVNUQnVpbGRlcjo6bWFrZURpdk5vZGUo RXhwcmVzc2lvbk5vZGUqIGV4cHIxLCBFeHByZXNzaW9uTm9kZSogZQogICAgIHJldHVybiBuZXcg KG1fZ2xvYmFsRGF0YSkgRGl2Tm9kZShtX2dsb2JhbERhdGEsIGV4cHIxLCBleHByMiwgcmlnaHRI YXNBc3NpZ25tZW50cyk7CiB9CiAKK0V4cHJlc3Npb25Ob2RlKiBBU1RCdWlsZGVyOjptYWtlTW9k Tm9kZShFeHByZXNzaW9uTm9kZSogZXhwcjEsIEV4cHJlc3Npb25Ob2RlKiBleHByMiwgYm9vbCBy aWdodEhhc0Fzc2lnbm1lbnRzKQoreworICAgIGV4cHIxID0gZXhwcjEtPnN0cmlwVW5hcnlQbHVz KCk7CisgICAgZXhwcjIgPSBleHByMi0+c3RyaXBVbmFyeVBsdXMoKTsKKyAgICAKKyAgICBpZiAo ZXhwcjEtPmlzTnVtYmVyKCkgJiYgZXhwcjItPmlzTnVtYmVyKCkpCisgICAgICAgIHJldHVybiBj cmVhdGVOdW1iZXIoZm1vZChzdGF0aWNfY2FzdDxOdW1iZXJOb2RlKj4oZXhwcjEpLT52YWx1ZSgp LCBzdGF0aWNfY2FzdDxOdW1iZXJOb2RlKj4oZXhwcjIpLT52YWx1ZSgpKSk7CisgICAgcmV0dXJu IG5ldyAobV9nbG9iYWxEYXRhKSBNb2ROb2RlKG1fZ2xvYmFsRGF0YSwgZXhwcjEsIGV4cHIyLCBy aWdodEhhc0Fzc2lnbm1lbnRzKTsKK30KKwogRXhwcmVzc2lvbk5vZGUqIEFTVEJ1aWxkZXI6Om1h a2VBZGROb2RlKEV4cHJlc3Npb25Ob2RlKiBleHByMSwgRXhwcmVzc2lvbk5vZGUqIGV4cHIyLCBi b29sIHJpZ2h0SGFzQXNzaWdubWVudHMpCiB7CiAgICAgaWYgKGV4cHIxLT5pc051bWJlcigpICYm IGV4cHIyLT5pc051bWJlcigpKQpAQCAtNzIxLDYgKzczNiwzNCBAQCBFeHByZXNzaW9uTm9kZSog QVNUQnVpbGRlcjo6bWFrZVJpZ2h0U2hpZnROb2RlKEV4cHJlc3Npb25Ob2RlKiBleHByMSwgRXhw cmVzc2lvbgogICAgIHJldHVybiBuZXcgKG1fZ2xvYmFsRGF0YSkgUmlnaHRTaGlmdE5vZGUobV9n bG9iYWxEYXRhLCBleHByMSwgZXhwcjIsIHJpZ2h0SGFzQXNzaWdubWVudHMpOwogfQogCitFeHBy ZXNzaW9uTm9kZSogQVNUQnVpbGRlcjo6bWFrZVVSaWdodFNoaWZ0Tm9kZShFeHByZXNzaW9uTm9k ZSogZXhwcjEsIEV4cHJlc3Npb25Ob2RlKiBleHByMiwgYm9vbCByaWdodEhhc0Fzc2lnbm1lbnRz KQoreworICAgIGlmIChleHByMS0+aXNOdW1iZXIoKSAmJiBleHByMi0+aXNOdW1iZXIoKSkKKyAg ICAgICAgcmV0dXJuIGNyZWF0ZU51bWJlcih0b1VJbnQzMihzdGF0aWNfY2FzdDxOdW1iZXJOb2Rl Kj4oZXhwcjEpLT52YWx1ZSgpKSA+PiAodG9VSW50MzIoc3RhdGljX2Nhc3Q8TnVtYmVyTm9kZSo+ KGV4cHIyKS0+dmFsdWUoKSkgJiAweDFmKSk7CisgICAgcmV0dXJuIG5ldyAobV9nbG9iYWxEYXRh KSBVbnNpZ25lZFJpZ2h0U2hpZnROb2RlKG1fZ2xvYmFsRGF0YSwgZXhwcjEsIGV4cHIyLCByaWdo dEhhc0Fzc2lnbm1lbnRzKTsKK30KKworRXhwcmVzc2lvbk5vZGUqIEFTVEJ1aWxkZXI6Om1ha2VC aXRPck5vZGUoRXhwcmVzc2lvbk5vZGUqIGV4cHIxLCBFeHByZXNzaW9uTm9kZSogZXhwcjIsIGJv b2wgcmlnaHRIYXNBc3NpZ25tZW50cykKK3sKKyAgICBpZiAoZXhwcjEtPmlzTnVtYmVyKCkgJiYg ZXhwcjItPmlzTnVtYmVyKCkpCisgICAgICAgIHJldHVybiBjcmVhdGVOdW1iZXIodG9JbnQzMihz dGF0aWNfY2FzdDxOdW1iZXJOb2RlKj4oZXhwcjEpLT52YWx1ZSgpKSB8IHRvSW50MzIoc3RhdGlj X2Nhc3Q8TnVtYmVyTm9kZSo+KGV4cHIyKS0+dmFsdWUoKSkpOworICAgIHJldHVybiBuZXcgKG1f Z2xvYmFsRGF0YSkgQml0T3JOb2RlKG1fZ2xvYmFsRGF0YSwgZXhwcjEsIGV4cHIyLCByaWdodEhh c0Fzc2lnbm1lbnRzKTsKK30KKworRXhwcmVzc2lvbk5vZGUqIEFTVEJ1aWxkZXI6Om1ha2VCaXRB bmROb2RlKEV4cHJlc3Npb25Ob2RlKiBleHByMSwgRXhwcmVzc2lvbk5vZGUqIGV4cHIyLCBib29s IHJpZ2h0SGFzQXNzaWdubWVudHMpCit7CisgICAgaWYgKGV4cHIxLT5pc051bWJlcigpICYmIGV4 cHIyLT5pc051bWJlcigpKQorICAgICAgICByZXR1cm4gY3JlYXRlTnVtYmVyKHRvSW50MzIoc3Rh dGljX2Nhc3Q8TnVtYmVyTm9kZSo+KGV4cHIxKS0+dmFsdWUoKSkgJiB0b0ludDMyKHN0YXRpY19j YXN0PE51bWJlck5vZGUqPihleHByMiktPnZhbHVlKCkpKTsKKyAgICByZXR1cm4gbmV3IChtX2ds b2JhbERhdGEpIEJpdEFuZE5vZGUobV9nbG9iYWxEYXRhLCBleHByMSwgZXhwcjIsIHJpZ2h0SGFz QXNzaWdubWVudHMpOworfQorCitFeHByZXNzaW9uTm9kZSogQVNUQnVpbGRlcjo6bWFrZUJpdFhP ck5vZGUoRXhwcmVzc2lvbk5vZGUqIGV4cHIxLCBFeHByZXNzaW9uTm9kZSogZXhwcjIsIGJvb2wg cmlnaHRIYXNBc3NpZ25tZW50cykKK3sKKyAgICBpZiAoZXhwcjEtPmlzTnVtYmVyKCkgJiYgZXhw cjItPmlzTnVtYmVyKCkpCisgICAgICAgIHJldHVybiBjcmVhdGVOdW1iZXIodG9JbnQzMihzdGF0 aWNfY2FzdDxOdW1iZXJOb2RlKj4oZXhwcjEpLT52YWx1ZSgpKSBeIHRvSW50MzIoc3RhdGljX2Nh c3Q8TnVtYmVyTm9kZSo+KGV4cHIyKS0+dmFsdWUoKSkpOworICAgIHJldHVybiBuZXcgKG1fZ2xv YmFsRGF0YSkgQml0WE9yTm9kZShtX2dsb2JhbERhdGEsIGV4cHIxLCBleHByMiwgcmlnaHRIYXNB c3NpZ25tZW50cyk7Cit9CisKIEV4cHJlc3Npb25Ob2RlKiBBU1RCdWlsZGVyOjptYWtlRnVuY3Rp b25DYWxsTm9kZShFeHByZXNzaW9uTm9kZSogZnVuYywgQXJndW1lbnRzTm9kZSogYXJncywgaW50 IHN0YXJ0LCBpbnQgZGl2b3QsIGludCBlbmQpCiB7CiAgICAgaWYgKCFmdW5jLT5pc0xvY2F0aW9u KCkpCkBAIC03NjMsMTMgKzgwNiwxMyBAQCBFeHByZXNzaW9uTm9kZSogQVNUQnVpbGRlcjo6bWFr ZUJpbmFyeU5vZGUoaW50IHRva2VuLCBwYWlyPEV4cHJlc3Npb25Ob2RlKiwgQmluYQogICAgICAg ICByZXR1cm4gbmV3IChtX2dsb2JhbERhdGEpIExvZ2ljYWxPcE5vZGUobV9nbG9iYWxEYXRhLCBs aHMuZmlyc3QsIHJocy5maXJzdCwgT3BMb2dpY2FsQW5kKTsKIAogICAgIGNhc2UgQklUT1I6Ci0g ICAgICAgIHJldHVybiBuZXcgKG1fZ2xvYmFsRGF0YSkgQml0T3JOb2RlKG1fZ2xvYmFsRGF0YSwg bGhzLmZpcnN0LCByaHMuZmlyc3QsIHJocy5zZWNvbmQuaGFzQXNzaWdubWVudCk7CisgICAgICAg IHJldHVybiBtYWtlQml0T3JOb2RlKGxocy5maXJzdCwgcmhzLmZpcnN0LCByaHMuc2Vjb25kLmhh c0Fzc2lnbm1lbnQpOwogCiAgICAgY2FzZSBCSVRYT1I6Ci0gICAgICAgIHJldHVybiBuZXcgKG1f Z2xvYmFsRGF0YSkgQml0WE9yTm9kZShtX2dsb2JhbERhdGEsIGxocy5maXJzdCwgcmhzLmZpcnN0 LCByaHMuc2Vjb25kLmhhc0Fzc2lnbm1lbnQpOworICAgICAgICByZXR1cm4gbWFrZUJpdFhPck5v ZGUobGhzLmZpcnN0LCByaHMuZmlyc3QsIHJocy5zZWNvbmQuaGFzQXNzaWdubWVudCk7CiAKICAg ICBjYXNlIEJJVEFORDoKLSAgICAgICAgcmV0dXJuIG5ldyAobV9nbG9iYWxEYXRhKSBCaXRBbmRO b2RlKG1fZ2xvYmFsRGF0YSwgbGhzLmZpcnN0LCByaHMuZmlyc3QsIHJocy5zZWNvbmQuaGFzQXNz aWdubWVudCk7CisgICAgICAgIHJldHVybiBtYWtlQml0QW5kTm9kZShsaHMuZmlyc3QsIHJocy5m aXJzdCwgcmhzLnNlY29uZC5oYXNBc3NpZ25tZW50KTsKIAogICAgIGNhc2UgRVFFUToKICAgICAg ICAgcmV0dXJuIG5ldyAobV9nbG9iYWxEYXRhKSBFcXVhbE5vZGUobV9nbG9iYWxEYXRhLCBsaHMu Zmlyc3QsIHJocy5maXJzdCwgcmhzLnNlY29uZC5oYXNBc3NpZ25tZW50KTsKQEAgLTgxNCw3ICs4 NTcsNyBAQCBFeHByZXNzaW9uTm9kZSogQVNUQnVpbGRlcjo6bWFrZUJpbmFyeU5vZGUoaW50IHRv a2VuLCBwYWlyPEV4cHJlc3Npb25Ob2RlKiwgQmluYQogICAgICAgICByZXR1cm4gbWFrZVJpZ2h0 U2hpZnROb2RlKGxocy5maXJzdCwgcmhzLmZpcnN0LCByaHMuc2Vjb25kLmhhc0Fzc2lnbm1lbnQp OwogCiAgICAgY2FzZSBVUlNISUZUOgotICAgICAgICByZXR1cm4gbmV3IChtX2dsb2JhbERhdGEp IFVuc2lnbmVkUmlnaHRTaGlmdE5vZGUobV9nbG9iYWxEYXRhLCBsaHMuZmlyc3QsIHJocy5maXJz dCwgcmhzLnNlY29uZC5oYXNBc3NpZ25tZW50KTsKKyAgICAgICAgcmV0dXJuIG1ha2VVUmlnaHRT aGlmdE5vZGUobGhzLmZpcnN0LCByaHMuZmlyc3QsIHJocy5zZWNvbmQuaGFzQXNzaWdubWVudCk7 CiAKICAgICBjYXNlIFBMVVM6CiAgICAgICAgIHJldHVybiBtYWtlQWRkTm9kZShsaHMuZmlyc3Qs IHJocy5maXJzdCwgcmhzLnNlY29uZC5oYXNBc3NpZ25tZW50KTsKQEAgLTgyOSw3ICs4NzIsNyBA QCBFeHByZXNzaW9uTm9kZSogQVNUQnVpbGRlcjo6bWFrZUJpbmFyeU5vZGUoaW50IHRva2VuLCBw YWlyPEV4cHJlc3Npb25Ob2RlKiwgQmluYQogICAgICAgICByZXR1cm4gbWFrZURpdk5vZGUobGhz LmZpcnN0LCByaHMuZmlyc3QsIHJocy5zZWNvbmQuaGFzQXNzaWdubWVudCk7CiAKICAgICBjYXNl IE1PRDoKLSAgICAgICAgcmV0dXJuIG5ldyAobV9nbG9iYWxEYXRhKSBNb2ROb2RlKG1fZ2xvYmFs RGF0YSwgbGhzLmZpcnN0LCByaHMuZmlyc3QsIHJocy5zZWNvbmQuaGFzQXNzaWdubWVudCk7Cisg ICAgICAgIHJldHVybiBtYWtlTW9kTm9kZShsaHMuZmlyc3QsIHJocy5maXJzdCwgcmhzLnNlY29u ZC5oYXNBc3NpZ25tZW50KTsKICAgICB9CiAgICAgQ1JBU0goKTsKICAgICByZXR1cm4gMDsK