152833 2016-01-07 09:12:01 -0800 ARMv7 or32(TrustedImm32, AbsoluteAddress) may have a bug with its use of dataTempRegister. 2016-01-07 12:22:24 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam benjamin commit-queue keith_miller msaboff ossy saam oldest_to_newest 1153424 0 mark.lam 2016-01-07 09:12:01 -0800 Details in the coming patch. 1153429 1 268457 mark.lam 2016-01-07 09:34:53 -0800 Created attachment 268457 proposed fix. 1153475 2 268457 mark.lam 2016-01-07 11:25:25 -0800 Comment on attachment 268457 proposed fix. This patch has passed the JSC tests on ARM64 and ARMv7. It's ready for a review. 1153488 3 mark.lam 2016-01-07 11:43:41 -0800 Thanks for the review. Landed in r194707: <http://trac.webkit.org/r194707>. 1153490 4 268457 msaboff 2016-01-07 11:52:29 -0800 Comment on attachment 268457 proposed fix. View in context: https://bugs.webkit.org/attachment.cgi?id=268457&action=review r- > Source/JavaScriptCore/assembler/MacroAssemblerARM64.h:548 > + or32(imm, memoryTempRegister, memoryTempRegister); > + store32(memoryTempRegister, address.m_ptr); You can't store32 with a source of memoryTempRegister as it will be needed to materialize the address. You could change this to: or32(imm, memoryTempRegister, getCachedDataTempRegisterIDAndInvalidate()); store32(dataTempRegister, address.m_ptr); Also, please add an ASSERT() to template<int datasize> store() that the src register cannot be memoryTempRegister. 1153499 5 268473 mark.lam 2016-01-07 12:17:33 -0800 Created attachment 268473 follow up fix for ARM64. 1153500 6 268473 msaboff 2016-01-07 12:19:03 -0800 Comment on attachment 268473 follow up fix for ARM64. r=me 1153503 7 mark.lam 2016-01-07 12:22:24 -0800 Thanks for the review. Follow up fix landed in r194711: <http://trac.webkit.org/r194711>. 268457 2016-01-07 09:34:53 -0800 2016-01-07 11:52:29 -0800 proposed fix. bug-152833.patch text/plain 5142 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk0Njk5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBA CisyMDE2LTAxLTA3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB Uk12NyBvcjMyKFRydXN0ZWRJbW0zMiwgQWJzb2x1dGVBZGRyZXNzKSBtYXkgaGF2ZSBhIGJ1ZyB3 aXRoIGl0cyB1c2Ugb2YgZGF0YVRlbXBSZWdpc3Rlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjgzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNLmg6 CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNOjpvcjMyKToKKyAgICAgICAgLSBBZGRl ZCBzb21lIGFzc2VydGlvbnMgdG8gbWFrZSBzdXJlIGl0IGlzIHNhZmUgdG8gdXNlIEFSTVJlZ2lz dGVyczo6UzAgYXMgYSB0ZW1wLgorICAgICAgICAqIGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFS TTY0Lmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNNjQ6Om9yMzIpOgorICAgICAg ICAtIEltcGxlbWVudCBhbiBvcHRpbWl6YXRpb24gdGhhdCBhdm9pZHMgcmVsb2FkaW5nIHRoZSBt ZW1vcnlUZW1wUmVnaXN0ZXIgd2hlbgorICAgICAgICAgIHRoZSBpbW1lZGlhdGUgaXMgZW5jb2Rh YmxlIGFzIGFuIGluc3RydWN0aW9uIGltbWVkaWF0ZS4KKyAgICAgICAgKiBhc3NlbWJsZXIvTWFj cm9Bc3NlbWJsZXJBUk12Ny5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTXY3Ojpv cjMyKToKKyAgICAgICAgLSBBZGRlZCBhbiBhc3NlcnRpb24gdG8gbWFrZSBzdXJlIGl0IGlzIHNh ZmUgdG8gdXNlIHRoZSBkYXRhVGVtcFJlZ2lzdGVyIGFzIGEgdGVtcC4KKyAgICAgICAgLSBJbXBs ZW1lbnQgYW4gb3B0aW1pemF0aW9uIHRoYXQgYXZvaWRzIHJlbG9hZGluZyB0aGUgbWVtb3J5VGVt cFJlZ2lzdGVyIHdoZW4KKyAgICAgICAgICB0aGUgaW1tZWRpYXRlIGlzIGVuY29kYWJsZSBhcyBh biBpbnN0cnVjdGlvbiBpbW1lZGlhdGUuICBJbiB0aGUgZXZlbnQgdGhhdCB3ZQorICAgICAgICAg IGNhbm5vdCBlbmNvZGUgdGhlIGltbWVkaWF0ZSwgd2UnbGwgdXNlIHRoZSBhZGRyZXNzVGVtcFJl Z2lzdGVyIGFzIGEgdGVtcCwgYW5kCisgICAgICAgICAgcmVsb2FkIGl0IGxhdGVyLgorCiAyMDE2 LTAxLTA3ICBKdWxpZW4gQnJpYW5jZWF1ICA8amJyaWFuY2VAY2lzY28uY29tPgogCiAgICAgICAg IFttaXBzXSBBZGQgdHdvIG1pc3NpbmcgYWJvcnRXaXRoUmVhc29uIGltcGxlbWVudGF0aW9ucwpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTTY0 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fz c2VtYmxlckFSTTY0LmgJKHJldmlzaW9uIDE5NDY5OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk02NC5oCSh3b3JraW5nIGNvcHkpCkBAIC01Mzcs OSArNTM3LDE2IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgb3IzMihUcnVzdGVkSW1tMzIgaW1tLCBB YnNvbHV0ZUFkZHJlc3MgYWRkcmVzcykKICAgICB7Ci0gICAgICAgIGxvYWQzMihhZGRyZXNzLm1f cHRyLCBnZXRDYWNoZWRNZW1vcnlUZW1wUmVnaXN0ZXJJREFuZEludmFsaWRhdGUoKSk7Ci0gICAg ICAgIG9yMzIoaW1tLCBtZW1vcnlUZW1wUmVnaXN0ZXIsIG1lbW9yeVRlbXBSZWdpc3Rlcik7Ci0g ICAgICAgIHN0b3JlMzIobWVtb3J5VGVtcFJlZ2lzdGVyLCBhZGRyZXNzLm1fcHRyKTsKKyAgICAg ICAgTG9naWNhbEltbWVkaWF0ZSBsb2dpY2FsSW1tID0gTG9naWNhbEltbWVkaWF0ZTo6Y3JlYXRl MzIoaW1tLm1fdmFsdWUpOworICAgICAgICBpZiAobG9naWNhbEltbS5pc1ZhbGlkKCkpIHsKKyAg ICAgICAgICAgIGxvYWQzMihhZGRyZXNzLm1fcHRyLCBnZXRDYWNoZWREYXRhVGVtcFJlZ2lzdGVy SURBbmRJbnZhbGlkYXRlKCkpOworICAgICAgICAgICAgbV9hc3NlbWJsZXIub3JyPDMyPihkYXRh VGVtcFJlZ2lzdGVyLCBkYXRhVGVtcFJlZ2lzdGVyLCBsb2dpY2FsSW1tKTsKKyAgICAgICAgICAg IHN0b3JlMzIoZGF0YVRlbXBSZWdpc3RlciwgYWRkcmVzcy5tX3B0cik7CisgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgICBsb2FkMzIoYWRkcmVzcy5tX3B0ciwgZ2V0Q2FjaGVkTWVtb3J5VGVt cFJlZ2lzdGVySURBbmRJbnZhbGlkYXRlKCkpOworICAgICAgICAgICAgb3IzMihpbW0sIG1lbW9y eVRlbXBSZWdpc3RlciwgbWVtb3J5VGVtcFJlZ2lzdGVyKTsKKyAgICAgICAgICAgIHN0b3JlMzIo bWVtb3J5VGVtcFJlZ2lzdGVyLCBhZGRyZXNzLm1fcHRyKTsKKyAgICAgICAgfQogICAgIH0KIAog ICAgIHZvaWQgb3IzMihUcnVzdGVkSW1tMzIgaW1tLCBBZGRyZXNzIGFkZHJlc3MpCkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFS TS5oCShyZXZpc2lvbiAxOTQ2OTkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVy L01hY3JvQXNzZW1ibGVyQVJNLmgJKHdvcmtpbmcgY29weSkKQEAgLTIzOSwxMSArMjM5LDEzIEBA IHB1YmxpYzoKIAogICAgIHZvaWQgb3IzMihUcnVzdGVkSW1tMzIgaW1tLCBSZWdpc3RlcklEIGRl c3QpCiAgICAgeworICAgICAgICBBU1NFUlQoZGVzdCAhPSBBUk1SZWdpc3RlcnM6OlMwKTsKICAg ICAgICAgbV9hc3NlbWJsZXIub3JycyhkZXN0LCBkZXN0LCBtX2Fzc2VtYmxlci5nZXRJbW0oaW1t Lm1fdmFsdWUsIEFSTVJlZ2lzdGVyczo6UzApKTsKICAgICB9CiAKICAgICB2b2lkIG9yMzIoVHJ1 c3RlZEltbTMyIGltbSwgUmVnaXN0ZXJJRCBzcmMsIFJlZ2lzdGVySUQgZGVzdCkKICAgICB7Cisg ICAgICAgIEFTU0VSVChzcmMgIT0gQVJNUmVnaXN0ZXJzOjpTMCk7CiAgICAgICAgIG1fYXNzZW1i bGVyLm9ycnMoZGVzdCwgc3JjLCBtX2Fzc2VtYmxlci5nZXRJbW0oaW1tLm1fdmFsdWUsIEFSTVJl Z2lzdGVyczo6UzApKTsKICAgICB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3Nl bWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oCShyZXZpc2lvbiAxOTQ2OTkp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNdjcu aAkod29ya2luZyBjb3B5KQpAQCAtMzU0LDEwICszNTQsMjAgQEAgcHVibGljOgogCiAgICAgdm9p ZCBvcjMyKFRydXN0ZWRJbW0zMiBpbW0sIEFic29sdXRlQWRkcmVzcyBhZGRyZXNzKQogICAgIHsK LSAgICAgICAgbW92ZShUcnVzdGVkSW1tUHRyKGFkZHJlc3MubV9wdHIpLCBhZGRyZXNzVGVtcFJl Z2lzdGVyKTsKLSAgICAgICAgbG9hZDMyKGFkZHJlc3NUZW1wUmVnaXN0ZXIsIGRhdGFUZW1wUmVn aXN0ZXIpOwotICAgICAgICBvcjMyKGltbSwgZGF0YVRlbXBSZWdpc3RlciwgZGF0YVRlbXBSZWdp c3Rlcik7Ci0gICAgICAgIHN0b3JlMzIoZGF0YVRlbXBSZWdpc3RlciwgYWRkcmVzc1RlbXBSZWdp c3Rlcik7CisgICAgICAgIEFSTVRodW1iSW1tZWRpYXRlIGFybUltbSA9IEFSTVRodW1iSW1tZWRp YXRlOjptYWtlRW5jb2RlZEltbShpbW0ubV92YWx1ZSk7CisgICAgICAgIGlmIChhcm1JbW0uaXNW YWxpZCgpKSB7CisgICAgICAgICAgICBtb3ZlKFRydXN0ZWRJbW1QdHIoYWRkcmVzcy5tX3B0ciks IGFkZHJlc3NUZW1wUmVnaXN0ZXIpOworICAgICAgICAgICAgbG9hZDMyKGFkZHJlc3NUZW1wUmVn aXN0ZXIsIGRhdGFUZW1wUmVnaXN0ZXIpOworICAgICAgICAgICAgbV9hc3NlbWJsZXIub3JyKGRh dGFUZW1wUmVnaXN0ZXIsIGRhdGFUZW1wUmVnaXN0ZXIsIGFybUltbSk7CisgICAgICAgICAgICBz dG9yZTMyKGRhdGFUZW1wUmVnaXN0ZXIsIGFkZHJlc3NUZW1wUmVnaXN0ZXIpOworICAgICAgICB9 IGVsc2UgeworICAgICAgICAgICAgbW92ZShUcnVzdGVkSW1tUHRyKGFkZHJlc3MubV9wdHIpLCBh ZGRyZXNzVGVtcFJlZ2lzdGVyKTsKKyAgICAgICAgICAgIGxvYWQzMihhZGRyZXNzVGVtcFJlZ2lz dGVyLCBkYXRhVGVtcFJlZ2lzdGVyKTsKKyAgICAgICAgICAgIG1vdmUoaW1tLCBhZGRyZXNzVGVt cFJlZ2lzdGVyKTsKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLm9ycihkYXRhVGVtcFJlZ2lzdGVy LCBkYXRhVGVtcFJlZ2lzdGVyLCBhZGRyZXNzVGVtcFJlZ2lzdGVyKTsKKyAgICAgICAgICAgIG1v dmUoVHJ1c3RlZEltbVB0cihhZGRyZXNzLm1fcHRyKSwgYWRkcmVzc1RlbXBSZWdpc3Rlcik7Cisg ICAgICAgICAgICBzdG9yZTMyKGRhdGFUZW1wUmVnaXN0ZXIsIGFkZHJlc3NUZW1wUmVnaXN0ZXIp OworICAgICAgICB9CiAgICAgfQogCiAgICAgdm9pZCBvcjMyKFRydXN0ZWRJbW0zMiBpbW0sIEFk ZHJlc3MgYWRkcmVzcykKQEAgLTM4Myw2ICszOTMsNyBAQCBwdWJsaWM6CiAgICAgICAgIGlmIChh cm1JbW0uaXNWYWxpZCgpKQogICAgICAgICAgICAgbV9hc3NlbWJsZXIub3JyKGRlc3QsIHNyYywg YXJtSW1tKTsKICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICBBU1NFUlQoc3JjICE9IGRhdGFU ZW1wUmVnaXN0ZXIpOwogICAgICAgICAgICAgbW92ZShpbW0sIGRhdGFUZW1wUmVnaXN0ZXIpOwog ICAgICAgICAgICAgbV9hc3NlbWJsZXIub3JyKGRlc3QsIHNyYywgZGF0YVRlbXBSZWdpc3Rlcik7 CiAgICAgICAgIH0K 268473 2016-01-07 12:17:33 -0800 2016-01-07 12:19:03 -0800 follow up fix for ARM64. bug-152833b.patch text/plain 1934 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk0NzEwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBA CisyMDE2LTAxLTA3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB Uk12NyBvcjMyKFRydXN0ZWRJbW0zMiwgQWJzb2x1dGVBZGRyZXNzKSBtYXkgaGF2ZSBhIGJ1ZyB3 aXRoIGl0cyB1c2Ugb2YgZGF0YVRlbXBSZWdpc3Rlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjgzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvbGxvdy11cCBwYXRjaCB0byBmaXggaWxsZWdhbCB1 c2Ugb2YgbWVtb3J5VGVtcFJlZ2lzdGVyIGFzIHRoZSBzcmMgZm9yIEFSTTY0J3MKKyAgICAgICAg c3RvcmUzMi4KKworICAgICAgICAqIGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTTY0Lmg6Cisg ICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNNjQ6Om9yMzIpOgorICAgICAgICAoSlNDOjpN YWNyb0Fzc2VtYmxlckFSTTY0OjpzdG9yZSk6CisKIDIwMTYtMDEtMDcgIEtvbnN0YW50aW4gVG9r YXJldiAgPGFubnVsZW5AeWFuZGV4LnJ1PgogCiAgICAgICAgIFttaXBzXSBHUFJJbmZvOjp0b0Fy Z3VtZW50UmVnaXN0ZXIgbWlzc2luZwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2Vt Ymxlci9NYWNyb0Fzc2VtYmxlckFSTTY0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTTY0LmgJKHJldmlzaW9uIDE5NDcxMCkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk02NC5o CSh3b3JraW5nIGNvcHkpCkBAIC01NDQsOCArNTQ0LDggQEAgcHVibGljOgogICAgICAgICAgICAg c3RvcmUzMihkYXRhVGVtcFJlZ2lzdGVyLCBhZGRyZXNzLm1fcHRyKTsKICAgICAgICAgfSBlbHNl IHsKICAgICAgICAgICAgIGxvYWQzMihhZGRyZXNzLm1fcHRyLCBnZXRDYWNoZWRNZW1vcnlUZW1w UmVnaXN0ZXJJREFuZEludmFsaWRhdGUoKSk7Ci0gICAgICAgICAgICBvcjMyKGltbSwgbWVtb3J5 VGVtcFJlZ2lzdGVyLCBtZW1vcnlUZW1wUmVnaXN0ZXIpOwotICAgICAgICAgICAgc3RvcmUzMiht ZW1vcnlUZW1wUmVnaXN0ZXIsIGFkZHJlc3MubV9wdHIpOworICAgICAgICAgICAgb3IzMihpbW0s IG1lbW9yeVRlbXBSZWdpc3RlciwgZ2V0Q2FjaGVkRGF0YVRlbXBSZWdpc3RlcklEQW5kSW52YWxp ZGF0ZSgpKTsKKyAgICAgICAgICAgIHN0b3JlMzIoZGF0YVRlbXBSZWdpc3RlciwgYWRkcmVzcy5t X3B0cik7CiAgICAgICAgIH0KICAgICB9CiAKQEAgLTMwMzgsNiArMzAzOCw3IEBAIHByaXZhdGU6 CiAgICAgdGVtcGxhdGU8aW50IGRhdGFzaXplPgogICAgIEFMV0FZU19JTkxJTkUgdm9pZCBzdG9y ZShSZWdpc3RlcklEIHNyYywgY29uc3Qgdm9pZCogYWRkcmVzcykKICAgICB7CisgICAgICAgIEFT U0VSVChzcmMgIT0gbWVtb3J5VGVtcFJlZ2lzdGVyKTsKICAgICAgICAgaW50cHRyX3QgY3VycmVu dFJlZ2lzdGVyQ29udGVudHM7CiAgICAgICAgIGlmIChtX2NhY2hlZE1lbW9yeVRlbXBSZWdpc3Rl ci52YWx1ZShjdXJyZW50UmVnaXN0ZXJDb250ZW50cykpIHsKICAgICAgICAgICAgIGludHB0cl90 IGFkZHJlc3NBc0ludCA9IHJlaW50ZXJwcmV0X2Nhc3Q8aW50cHRyX3Q+KGFkZHJlc3MpOwo=