153568 2016-01-27 15:43:34 -0800 B3 IntRange analysis should know more about shifting 2016-01-27 21:22:43 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 150507 1 fpizlo fpizlo barraclough benjamin commit-queue ggaren keith_miller mark.lam mhahnenb msaboff oliver saam sam oldest_to_newest 1159485 0 fpizlo 2016-01-27 15:43:34 -0800 This will help remove another overflow check in Octane/encrypt. 1159490 1 270055 fpizlo 2016-01-27 15:47:16 -0800 Created attachment 270055 the patch 1159527 2 270055 benjamin 2016-01-27 16:55:03 -0800 Comment on attachment 270055 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=270055&action=review > Source/JavaScriptCore/b3/B3ReduceStrength.cpp:280 > + return sShr<int32_t>(shiftAmount); int32_t? 1159589 3 fpizlo 2016-01-27 20:23:46 -0800 (In reply to comment #2) > Comment on attachment 270055 [details] > the patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=270055&action=review > > > Source/JavaScriptCore/b3/B3ReduceStrength.cpp:280 > > + return sShr<int32_t>(shiftAmount); > > int32_t? That's embarrassing. 1159590 4 fpizlo 2016-01-27 20:24:13 -0800 I'll write some tests before landing this. 1159633 5 fpizlo 2016-01-27 21:22:43 -0800 Landed in http://trac.webkit.org/changeset/195728 270055 2016-01-27 15:47:16 -0800 2016-01-27 16:55:03 -0800 the patch blah.patch text/plain 5940 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk1NzAwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDE2LTAxLTI3ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg QjMgSW50UmFuZ2UgYW5hbHlzaXMgc2hvdWxkIGtub3cgbW9yZSBhYm91dCBzaGlmdGluZworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUzNTY4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyB0ZWFjaGVz IHRoZSBJbnRSYW5nZSBhbmFseXNpcyB0aGF0IHRoZSByZXN1bHQgb2YgYSByaWdodCBzaGlmdCBp cyB1c3VhbGx5IGJldHRlciB0aGFuCisgICAgICAgIHRoZSB3b3JzdC1jYXNlIG1hc2sgYmFzZWQg b24gdGhlIHNoaWZ0IGFtb3VudC4gSW4gZmFjdCwgeW91IGNhbiByZWFjaCB1c2VmdWwgY29uY2x1 c2lvbnMKKyAgICAgICAgZnJvbSBsb29raW5nIGF0IHRoZSBJbnRSYW5nZSBvZiB0aGUgaW5wdXQu IFRoaXMgaGVscHMgYmVjYXVzZSBPY3RhbmUvY3J5cHRvIGRvZXMgc29tZXRoaW5nCisgICAgICAg IGxpa2U6CisKKyAgICAgICAgICAgIENoZWNrTXVsKChAeCAmICQyNjg0MzU0NTUpID4+IDE0LCBA eSA+PiAxNCwgLi4uKQorCisgICAgICAgIElmIHlvdSBjb25zaWRlciBqdXN0IHRoZSBzaGlmdHMs IHRoZW4gdGhpcyBtYXkgb3ZlcmZsb3cuIEJ1dCBpZiB5b3UgY29uc2lkZXIgdGhhdCBAeCBpcwor ICAgICAgICBmaXJzdCBtYXNrZWQsIHRoZW4gdGhlIEludFJhbmdlIGNvbWluZyBvdXQgb2YgdGhl IGZpcnN0IHNoaWZ0IGlzIHRpZ2h0IGVub3VnaCB0byBwcm92ZSB0aGF0CisgICAgICAgIHRoZSBD aGVja011bCBjYW5ub3Qgb3ZlcmZsb3cuCisKKyAgICAgICAgKiBiMy9CM1JlZHVjZVN0cmVuZ3Ro LmNwcDoKKwogMjAxNi0wMS0yNyAgUGVyIEFybmUgVm9sbGFuICA8cGVhdm9Ab3V0bG9vay5jb20+ CiAKICAgICAgICAgW0ZUTF1bV2luNjRdIENvbXBpbGUgZml4LgpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2IzL0IzUmVkdWNlU3RyZW5ndGguY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9iMy9CM1JlZHVjZVN0cmVuZ3RoLmNwcAkocmV2aXNpb24gMTk1NjgzKQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL0IzUmVkdWNlU3RyZW5ndGguY3BwCSh3b3JraW5n IGNvcHkpCkBAIC04OCw2ICs4OCw4IEBAIG5hbWVzcGFjZSB7CiAKIGJvb2wgdmVyYm9zZSA9IGZh bHNlOwogCisvLyBGSVhNRTogVGhpcyBJbnRSYW5nZSBzdHVmZiBzaG91bGQgYmUgcmVmYWN0b3Jl ZCBpbnRvIGEgZ2VuZXJhbCBjb25zdGFudCBwcm9wYWdhdG9yLiBJdCdzIHdlaXJkCisvLyB0aGF0 IGl0J3MganVzdCBzaXR0aW5nIGhlcmUgaW4gdGhpcyBmaWxlLgogY2xhc3MgSW50UmFuZ2Ugewog cHVibGljOgogICAgIEludFJhbmdlKCkKQEAgLTE2MiwyNSArMTY0LDYgQEAgcHVibGljOgogICAg ICAgICB9CiAgICAgfQogCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4KLSAgICBzdGF0aWMgSW50 UmFuZ2UgcmFuZ2VGb3JTU2hyKGludDMyX3Qgc2hpZnRBbW91bnQpCi0gICAgewotICAgICAgICBy ZXR1cm4gSW50UmFuZ2UodG9wPFQ+KCkubWluKCkgPj4gc2hpZnRBbW91bnQsIHRvcDxUPigpLm1h eCgpID4+IHNoaWZ0QW1vdW50KTsKLSAgICB9Ci0KLSAgICBzdGF0aWMgSW50UmFuZ2UgcmFuZ2VG b3JTU2hyKGludDMyX3Qgc2hpZnRBbW91bnQsIFR5cGUgdHlwZSkKLSAgICB7Ci0gICAgICAgIHN3 aXRjaCAodHlwZSkgewotICAgICAgICBjYXNlIEludDMyOgotICAgICAgICAgICAgcmV0dXJuIHJh bmdlRm9yU1NocjxpbnQzMl90PihzaGlmdEFtb3VudCk7Ci0gICAgICAgIGNhc2UgSW50NjQ6Ci0g ICAgICAgICAgICByZXR1cm4gcmFuZ2VGb3JTU2hyPGludDY0X3Q+KHNoaWZ0QW1vdW50KTsKLSAg ICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7 Ci0gICAgICAgICAgICByZXR1cm4gSW50UmFuZ2UoKTsKLSAgICAgICAgfQotICAgIH0KLQogICAg IGludDY0X3QgbWluKCkgY29uc3QgeyByZXR1cm4gbV9taW47IH0KICAgICBpbnQ2NF90IG1heCgp IGNvbnN0IHsgcmV0dXJuIG1fbWF4OyB9CiAKQEAgLTI1NSw4ICsyMzgsOCBAQCBwdWJsaWM6CiAg ICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4KICAgICBJbnRSYW5nZSBzaGwoaW50MzJfdCBzaGlmdEFt b3VudCkKICAgICB7Ci0gICAgICAgIFQgbmV3TWluID0gc3RhdGljX2Nhc3Q8VD4obV9taW4pIDw8 IHNoaWZ0QW1vdW50OwotICAgICAgICBUIG5ld01heCA9IHN0YXRpY19jYXN0PFQ+KG1fbWF4KSA8 PCBzaGlmdEFtb3VudDsKKyAgICAgICAgVCBuZXdNaW4gPSBzdGF0aWNfY2FzdDxUPihtX21pbikg PDwgc3RhdGljX2Nhc3Q8VD4oc2hpZnRBbW91bnQpOworICAgICAgICBUIG5ld01heCA9IHN0YXRp Y19jYXN0PFQ+KG1fbWF4KSA8PCBzdGF0aWNfY2FzdDxUPihzaGlmdEFtb3VudCk7CiAKICAgICAg ICAgaWYgKChuZXdNaW4gPj4gc2hpZnRBbW91bnQpICE9IHN0YXRpY19jYXN0PFQ+KG1fbWluKSkK ICAgICAgICAgICAgIG5ld01pbiA9IHN0ZDo6bnVtZXJpY19saW1pdHM8VD46Om1pbigpOwpAQCAt MjgwLDYgKzI2Myw2MSBAQCBwdWJsaWM6CiAgICAgfQogCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUg VD4KKyAgICBJbnRSYW5nZSBzU2hyKGludDMyX3Qgc2hpZnRBbW91bnQpCisgICAgeworICAgICAg ICBUIG5ld01pbiA9IHN0YXRpY19jYXN0PFQ+KG1fbWluKSA+PiBzdGF0aWNfY2FzdDxUPihzaGlm dEFtb3VudCk7CisgICAgICAgIFQgbmV3TWF4ID0gc3RhdGljX2Nhc3Q8VD4obV9tYXgpID4+IHN0 YXRpY19jYXN0PFQ+KHNoaWZ0QW1vdW50KTsKKworICAgICAgICByZXR1cm4gSW50UmFuZ2UobmV3 TWluLCBuZXdNYXgpOworICAgIH0KKworICAgIEludFJhbmdlIHNTaHIoaW50MzJfdCBzaGlmdEFt b3VudCwgVHlwZSB0eXBlKQorICAgIHsKKyAgICAgICAgc3dpdGNoICh0eXBlKSB7CisgICAgICAg IGNhc2UgSW50MzI6CisgICAgICAgICAgICByZXR1cm4gc1NocjxpbnQzMl90PihzaGlmdEFtb3Vu dCk7CisgICAgICAgIGNhc2UgSW50NjQ6CisgICAgICAgICAgICByZXR1cm4gc1NocjxpbnQzMl90 PihzaGlmdEFtb3VudCk7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBSRUxFQVNFX0FT U0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgcmV0dXJuIEludFJhbmdlKCk7CisgICAg ICAgIH0KKyAgICB9CisKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgorICAgIEludFJhbmdlIHpT aHIoaW50MzJfdCBzaGlmdEFtb3VudCkKKyAgICB7CisgICAgICAgIC8vIFRoaXMgaXMgYW4gYXdr d2FyZCBjb3JuZXIgY2FzZSBmb3IgYWxsIG9mIHRoZSBvdGhlciBsb2dpYy4KKyAgICAgICAgaWYg KCFzaGlmdEFtb3VudCkKKyAgICAgICAgICAgIHJldHVybiAqdGhpczsKKworICAgICAgICAvLyBJ ZiB0aGUgaW5wdXQgcmFuZ2UgbWF5IGJlIG5lZ2F0aXZlLCB0aGVuIGFsbCB3ZSBjYW4gc2F5IGFi b3V0IHRoZSBvdXRwdXQgcmFuZ2UgaXMgdGhhdCBpdAorICAgICAgICAvLyB3aWxsIGJlIG1hc2tl ZC4gVGhhdCdzIGJlY2F1c2UgLTEgcmlnaHQgc2hpZnRlZCBqdXN0IHByb2R1Y2VzIHRoYXQgbWFz ay4KKyAgICAgICAgaWYgKG1fbWluIDwgMCkKKyAgICAgICAgICAgIHJldHVybiByYW5nZUZvclpT aHI8VD4oc2hpZnRBbW91bnQpOworCisgICAgICAgIC8vIElmIHRoZSBpbnB1dCByYW5nZSBpcyBu b24tbmVnYXRpdmUsIHRoZW4gdGhpcyBqdXN0IGJyaW5ncyB0aGUgcmFuZ2UgY2xvc2VyIHRvIHpl cm8uCisgICAgICAgIHR5cGVkZWYgdHlwZW5hbWUgc3RkOjptYWtlX3Vuc2lnbmVkPFQ+Ojp0eXBl IFVuc2lnbmVkVDsKKyAgICAgICAgVW5zaWduZWRUIG5ld01pbiA9IHN0YXRpY19jYXN0PFVuc2ln bmVkVD4obV9taW4pID4+IHN0YXRpY19jYXN0PFVuc2lnbmVkVD4oc2hpZnRBbW91bnQpOworICAg ICAgICBVbnNpZ25lZFQgbmV3TWF4ID0gc3RhdGljX2Nhc3Q8VW5zaWduZWRUPihtX21heCkgPj4g c3RhdGljX2Nhc3Q8VW5zaWduZWRUPihzaGlmdEFtb3VudCk7CisgICAgICAgIAorICAgICAgICBy ZXR1cm4gSW50UmFuZ2UobmV3TWluLCBuZXdNYXgpOworICAgIH0KKworICAgIEludFJhbmdlIHpT aHIoaW50MzJfdCBzaGlmdEFtb3VudCwgVHlwZSB0eXBlKQorICAgIHsKKyAgICAgICAgc3dpdGNo ICh0eXBlKSB7CisgICAgICAgIGNhc2UgSW50MzI6CisgICAgICAgICAgICByZXR1cm4gelNocjxp bnQzMl90PihzaGlmdEFtb3VudCk7CisgICAgICAgIGNhc2UgSW50NjQ6CisgICAgICAgICAgICBy ZXR1cm4gelNocjxpbnQ2NF90PihzaGlmdEFtb3VudCk7CisgICAgICAgIGRlZmF1bHQ6CisgICAg ICAgICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgcmV0dXJu IEludFJhbmdlKCk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBU PgogICAgIEludFJhbmdlIGFkZChjb25zdCBJbnRSYW5nZSYgb3RoZXIpCiAgICAgewogICAgICAg ICBpZiAoY291bGRPdmVyZmxvd0FkZDxUPihvdGhlcikpCkBAIC0xOTU1LDE5ICsxOTkzLDI0IEBA IHByaXZhdGU6CiAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICBjYXNlIFNTaHI6Ci0gICAg ICAgICAgICBpZiAodmFsdWUtPmNoaWxkKDEpLT5oYXNJbnQzMigpKQotICAgICAgICAgICAgICAg IHJldHVybiBJbnRSYW5nZTo6cmFuZ2VGb3JTU2hyKHZhbHVlLT5jaGlsZCgxKS0+YXNJbnQzMigp LCB2YWx1ZS0+dHlwZSgpKTsKKyAgICAgICAgICAgIGlmICh2YWx1ZS0+Y2hpbGQoMSktPmhhc0lu dDMyKCkpIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gcmFuZ2VGb3IodmFsdWUtPmNoaWxkKDAp LCB0aW1lVG9MaXZlIC0gMSkuc1NocigKKyAgICAgICAgICAgICAgICAgICAgdmFsdWUtPmNoaWxk KDEpLT5hc0ludDMyKCksIHZhbHVlLT50eXBlKCkpOworICAgICAgICAgICAgfQogICAgICAgICAg ICAgYnJlYWs7CiAKICAgICAgICAgY2FzZSBaU2hyOgotICAgICAgICAgICAgaWYgKHZhbHVlLT5j aGlsZCgxKS0+aGFzSW50MzIoKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gSW50UmFuZ2U6OnJh bmdlRm9yWlNocih2YWx1ZS0+Y2hpbGQoMSktPmFzSW50MzIoKSwgdmFsdWUtPnR5cGUoKSk7Cisg ICAgICAgICAgICBpZiAodmFsdWUtPmNoaWxkKDEpLT5oYXNJbnQzMigpKSB7CisgICAgICAgICAg ICAgICAgcmV0dXJuIHJhbmdlRm9yKHZhbHVlLT5jaGlsZCgwKSwgdGltZVRvTGl2ZSAtIDEpLnpT aHIoCisgICAgICAgICAgICAgICAgICAgIHZhbHVlLT5jaGlsZCgxKS0+YXNJbnQzMigpLCB2YWx1 ZS0+dHlwZSgpKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAg IGNhc2UgU2hsOgotICAgICAgICAgICAgaWYgKHZhbHVlLT5jaGlsZCgxKS0+aGFzSW50MzIoKSkK KyAgICAgICAgICAgIGlmICh2YWx1ZS0+Y2hpbGQoMSktPmhhc0ludDMyKCkpIHsKICAgICAgICAg ICAgICAgICByZXR1cm4gcmFuZ2VGb3IodmFsdWUtPmNoaWxkKDApLCB0aW1lVG9MaXZlIC0gMSku c2hsKAogICAgICAgICAgICAgICAgICAgICB2YWx1ZS0+Y2hpbGQoMSktPmFzSW50MzIoKSwgdmFs dWUtPnR5cGUoKSk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBicmVhazsKIAogICAgICAg ICBjYXNlIEFkZDoK