196072 2019-03-21 03:33:34 -0700 [JSC] Fix build after r243232 on unsupported 64bit architectures 2019-03-21 22:58:50 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 tpopela tpopela ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1519588 0 tpopela 2019-03-21 03:33:34 -0700 The build was broken due to: #if CPU(X86_64) && CPU(ADDRESS64) static constexpr unsigned s_freeBitsAtTop = 16; static constexpr uintptr_t s_maskCompositeValueForPointer = 0x0000fffffffffff8; #elif CPU(ARM64) && CPU(ADDRESS64) static constexpr unsigned s_freeBitsAtTop = 28; static constexpr uintptr_t s_maskCompositeValueForPointer = 0x0000000ffffffff8; #endif missing the values for other 64bit arches (such as ppc64, ppc64le, s390x). Mark suggested that we should put the code introduced in r243232 behing the USE() flag. 1519592 1 365529 tpopela 2019-03-21 03:37:20 -0700 Created attachment 365529 Patch 1519673 2 365529 saam 2019-03-21 09:25:23 -0700 Comment on attachment 365529 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=365529&action=review Also please undef your define at the bottom of the header > Source/JavaScriptCore/bytecode/CodeOrigin.h:34 > +#define USE_COMPRESSED_CODE_ORIGIN CPU(ARM64) || CPU(X86_64) We can only opt in (ARM64 && ADDRESS64) We don’t want compression scheme for ARM64_32 1519678 3 365529 mark.lam 2019-03-21 09:30:16 -0700 Comment on attachment 365529 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=365529&action=review >> Source/JavaScriptCore/bytecode/CodeOrigin.h:34 >> +#define USE_COMPRESSED_CODE_ORIGIN CPU(ARM64) || CPU(X86_64) > > We can only opt in (ARM64 && ADDRESS64) > We don’t want compression scheme for ARM64_32 Hence, this line should say: #define USE_COMPRESSED_CODE_ORIGIN (CPU(ADDRESS64) && (CPU(ARM64) || CPU(X86_64))) That should exclude the CPU(ADDRESS64) architectures that cannot support this yet. 1519748 4 keith_miller 2019-03-21 11:11:46 -0700 I think we already expect 16 free bits at the top of any pointer for JSValue. Thus, I think you could change the code to: #if CPU(ARM64) && CPU(ADDRESS64) static constexpr unsigned s_freeBitsAtTop = 28; static constexpr uintptr_t s_maskCompositeValueForPointer = 0x0000000ffffffff8; #elif CPU(ADDRESS64) static constexpr unsigned s_freeBitsAtTop = 16; static constexpr uintptr_t s_maskCompositeValueForPointer = 0x0000fffffffffff8; #endif 1519810 5 tpopela 2019-03-21 12:06:40 -0700 Thank you Saam, Mark and Keith for the feedback! I will go with the Keith's suggestion (when the patch passes our CI). 1519839 6 365594 tpopela 2019-03-21 12:45:15 -0700 Created attachment 365594 Patch 1520068 7 365594 keith_miller 2019-03-21 17:42:17 -0700 Comment on attachment 365594 Patch r=me 1520174 8 365594 tpopela 2019-03-21 22:56:08 -0700 Comment on attachment 365594 Patch Clearing flags on attachment: 365594 Committed r243363: <https://trac.webkit.org/changeset/243363> 1520175 9 tpopela 2019-03-21 22:56:13 -0700 All reviewed patches have been landed. Closing bug. 1520176 10 webkit-bug-importer 2019-03-21 22:58:50 -0700 <rdar://problem/49141052> 365529 2019-03-21 03:37:20 -0700 2019-03-21 12:45:10 -0700 Patch bug-196072-20190321113719.patch text/plain 8117 tpopela U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzMjc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw Mzc1M2U3ZWJkMTNlOTViYjgyZDlkMWEyYTBlOTNjM2Y5YWE5YjUwLi41MDZmNjc4NzU4MzM2ZDcy NWVkZmUwMGIwODI3N2FhMDQwN2UzYWVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxOS0wMy0yMSAgVG9tYXMgUG9wZWxhICA8dHBvcGVsYUByZWRoYXQuY29t PgorCisgICAgICAgIFtKU0NdIEZpeCBidWlsZCBhZnRlciByMjQzMjMyIG9uIHVuc3VwcG9ydGVk IDY0Yml0IGFyY2hpdGVjdHVyZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5NjA3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFB1dCB0aGUgY29kZSBmcm9tIHIyNDMyMzIgYmVoaW5kIHRoZSBVU0VfQ09N UFJFU1NFRF9DT0RFX09SSUdJTiBmbGFnLgorCisgICAgICAgICogYnl0ZWNvZGUvQ29kZU9yaWdp bi5oOgorICAgICAgICAoSlNDOjpDb2RlT3JpZ2luOjpDb2RlT3JpZ2luKToKKyAgICAgICAgKEpT Qzo6Q29kZU9yaWdpbjo6b3BlcmF0b3I9KToKKyAgICAgICAgKEpTQzo6Q29kZU9yaWdpbjo6aXNT ZXQgY29uc3QpOgorICAgICAgICAoSlNDOjpDb2RlT3JpZ2luOjppc0hhc2hUYWJsZURlbGV0ZWRW YWx1ZSBjb25zdCk6CisgICAgICAgIChKU0M6OkNvZGVPcmlnaW46OmJ5dGVjb2RlSW5kZXggY29u c3QpOgorICAgICAgICAoSlNDOjpDb2RlT3JpZ2luOjppbmxpbmVDYWxsRnJhbWUgY29uc3QpOgor ICAgICAgICAoSlNDOjpDb2RlT3JpZ2luOjpkZWxldGVkTWFya2VyKToKKyAgICAgICAgKEpTQzo6 Q29kZU9yaWdpbjo6b3BlcmF0b3I9PSBjb25zdCk6CisKIDIwMTktMDMtMjAgIFNhYW0gQmFyYXRp ICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAgICAgREZHOjpBYnN0cmFjdFZhbHVlOjp2YWxp ZGF0ZU9TUkVudHJ5IGlzIHdyb25nIHdoZW4gaXNIZWFwVG9wIGFuZCB0aGUgaW5jb21pbmcgdmFs dWUgaXMgRW1wdHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9D b2RlT3JpZ2luLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZU9yaWdpbi5o CmluZGV4IDgwNGQzNTE2NDY5NmE4ZWUzNGZhNzY0NDFlMzNmZmI4NDg4YzU0ZDUuLjIwMGJiY2Rm NDNmZDMzMzY3YTEzOTRhMDM5YTA0MDUxYzRiNTRkMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlT3JpZ2luLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2J5dGVjb2RlL0NvZGVPcmlnaW4uaApAQCAtMjAsNyArMjAsNyBAQAogICogUFJPRklUUzsg T1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9S WQogICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZ LCBPUiBUT1JUCiAgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5H IElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKLSAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYg QURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuIAorICogT0YgVEhJUyBT T0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH RS4KICAqLwogCiAjcHJhZ21hIG9uY2UKQEAgLTMxLDYgKzMxLDggQEAKICNpbmNsdWRlIDx3dGYv U3RkTGliRXh0cmFzLmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCisjZGVmaW5lIFVTRV9D T01QUkVTU0VEX0NPREVfT1JJR0lOIENQVShBUk02NCkgfHwgQ1BVKFg4Nl82NCkKKwogbmFtZXNw YWNlIEpTQyB7CiAKIGNsYXNzIENvZGVCbG9jazsKQEAgLTQwLDcgKzQyLDcgQEAgc3RydWN0IElu bGluZUNhbGxGcmFtZTsKIGNsYXNzIENvZGVPcmlnaW4gewogcHVibGljOgogICAgIENvZGVPcmln aW4oKQotI2lmIENQVShBRERSRVNTNjQpCisjaWYgVVNFKENPTVBSRVNTRURfQ09ERV9PUklHSU4p CiAgICAgICAgIDogbV9jb21wb3NpdGVWYWx1ZShidWlsZENvbXBvc2l0ZVZhbHVlKG51bGxwdHIs IHNfaW52YWxpZEJ5dGVjb2RlSW5kZXgpKQogI2Vsc2UKICAgICAgICAgOiBtX2J5dGVjb2RlSW5k ZXgoc19pbnZhbGlkQnl0ZWNvZGVJbmRleCkKQEAgLTQ4LDkgKzUwLDkgQEAgcHVibGljOgogI2Vu ZGlmCiAgICAgewogICAgIH0KLSAgICAKKwogICAgIENvZGVPcmlnaW4oV1RGOjpIYXNoVGFibGVE ZWxldGVkVmFsdWVUeXBlKQotI2lmIENQVShBRERSRVNTNjQpCisjaWYgVVNFKENPTVBSRVNTRURf Q09ERV9PUklHSU4pCiAgICAgICAgIDogbV9jb21wb3NpdGVWYWx1ZShidWlsZENvbXBvc2l0ZVZh bHVlKGRlbGV0ZWRNYXJrZXIoKSwgc19pbnZhbGlkQnl0ZWNvZGVJbmRleCkpCiAjZWxzZQogICAg ICAgICA6IG1fYnl0ZWNvZGVJbmRleChzX2ludmFsaWRCeXRlY29kZUluZGV4KQpAQCAtNTgsOSAr NjAsOSBAQCBwdWJsaWM6CiAjZW5kaWYKICAgICB7CiAgICAgfQotICAgIAorCiAgICAgZXhwbGlj aXQgQ29kZU9yaWdpbih1bnNpZ25lZCBieXRlY29kZUluZGV4LCBJbmxpbmVDYWxsRnJhbWUqIGlu bGluZUNhbGxGcmFtZSA9IG51bGxwdHIpCi0jaWYgQ1BVKEFERFJFU1M2NCkKKyNpZiBVU0UoQ09N UFJFU1NFRF9DT0RFX09SSUdJTikKICAgICAgICAgOiBtX2NvbXBvc2l0ZVZhbHVlKGJ1aWxkQ29t cG9zaXRlVmFsdWUoaW5saW5lQ2FsbEZyYW1lLCBieXRlY29kZUluZGV4KSkKICNlbHNlCiAgICAg ICAgIDogbV9ieXRlY29kZUluZGV4KGJ5dGVjb2RlSW5kZXgpCkBAIC02OCwxOCArNzAsMTggQEAg cHVibGljOgogI2VuZGlmCiAgICAgewogICAgICAgICBBU1NFUlQoYnl0ZWNvZGVJbmRleCA8IHNf aW52YWxpZEJ5dGVjb2RlSW5kZXgpOwotI2lmIENQVShBRERSRVNTNjQpCisjaWYgVVNFKENPTVBS RVNTRURfQ09ERV9PUklHSU4pCiAgICAgICAgIEFTU0VSVCghKGJpdHdpc2VfY2FzdDx1aW50cHRy X3Q+KGlubGluZUNhbGxGcmFtZSkgJiB+c19tYXNrQ29tcG9zaXRlVmFsdWVGb3JQb2ludGVyKSk7 CiAjZW5kaWYKICAgICB9Ci0gICAgCi0jaWYgQ1BVKEFERFJFU1M2NCkKKworI2lmIFVTRShDT01Q UkVTU0VEX0NPREVfT1JJR0lOKQogICAgIENvZGVPcmlnaW4mIG9wZXJhdG9yPShjb25zdCBDb2Rl T3JpZ2luJiBvdGhlcikKICAgICB7CiAgICAgICAgIGlmICh0aGlzICE9ICZvdGhlcikgewogICAg ICAgICAgICAgaWYgKFVOTElLRUxZKGlzT3V0T2ZMaW5lKCkpKQogICAgICAgICAgICAgICAgIGRl bGV0ZSBvdXRPZkxpbmVDb2RlT3JpZ2luKCk7Ci0gICAgICAgICAgICAKKwogICAgICAgICAgICAg aWYgKFVOTElLRUxZKG90aGVyLmlzT3V0T2ZMaW5lKCkpKQogICAgICAgICAgICAgICAgIG1fY29t cG9zaXRlVmFsdWUgPSBidWlsZENvbXBvc2l0ZVZhbHVlKG90aGVyLmlubGluZUNhbGxGcmFtZSgp LCBvdGhlci5ieXRlY29kZUluZGV4KCkpOwogICAgICAgICAgICAgZWxzZQpAQCAtMTE4LDU4ICsx MjAsNTggQEAgcHVibGljOgogICAgICAgICAgICAgZGVsZXRlIG91dE9mTGluZUNvZGVPcmlnaW4o KTsKICAgICB9CiAjZW5kaWYKLSAgICAKKwogICAgIGJvb2wgaXNTZXQoKSBjb25zdAogICAgIHsK LSNpZiBDUFUoQUREUkVTUzY0KQorI2lmIFVTRShDT01QUkVTU0VEX0NPREVfT1JJR0lOKQogICAg ICAgICByZXR1cm4gIShtX2NvbXBvc2l0ZVZhbHVlICYgc19tYXNrSXNCeXRlY29kZUluZGV4SW52 YWxpZCk7CiAjZWxzZQogICAgICAgICByZXR1cm4gbV9ieXRlY29kZUluZGV4ICE9IHNfaW52YWxp ZEJ5dGVjb2RlSW5kZXg7CiAjZW5kaWYKICAgICB9CiAgICAgZXhwbGljaXQgb3BlcmF0b3IgYm9v bCgpIGNvbnN0IHsgcmV0dXJuIGlzU2V0KCk7IH0KLSAgICAKKwogICAgIGJvb2wgaXNIYXNoVGFi bGVEZWxldGVkVmFsdWUoKSBjb25zdAogICAgIHsKLSNpZiBDUFUoQUREUkVTUzY0KQorI2lmIFVT RShDT01QUkVTU0VEX0NPREVfT1JJR0lOKQogICAgICAgICByZXR1cm4gIWlzU2V0KCkgJiYgKG1f Y29tcG9zaXRlVmFsdWUgJiBzX21hc2tDb21wb3NpdGVWYWx1ZUZvclBvaW50ZXIpOwogI2Vsc2UK ICAgICAgICAgcmV0dXJuIG1fYnl0ZWNvZGVJbmRleCA9PSBzX2ludmFsaWRCeXRlY29kZUluZGV4 ICYmICEhbV9pbmxpbmVDYWxsRnJhbWU7CiAjZW5kaWYKICAgICB9Ci0gICAgCisKICAgICAvLyBU aGUgaW5saW5lIGRlcHRoIGlzIHRoZSBkZXB0aCBvZiB0aGUgaW5saW5lIHN0YWNrLCBzbyAxID0g bm90IGlubGluZWQsCiAgICAgLy8gMiA9IGlubGluZWQgb25lIGRlZXAsIGV0Yy4KICAgICB1bnNp Z25lZCBpbmxpbmVEZXB0aCgpIGNvbnN0OwotICAgIAorCiAgICAgLy8gSWYgdGhlIGNvZGUgb3Jp Z2luIGNvcnJlc3BvbmRzIHRvIGlubGluZWQgY29kZSwgZ2l2ZXMgeW91IHRoZSBoZWFwIG9iamVj dCB0aGF0CiAgICAgLy8gd291bGQgaGF2ZSBvd25lZCB0aGUgY29kZSBpZiBpdCBoYWQgbm90IGJl ZW4gaW5saW5lZC4gT3RoZXJ3aXNlIHJldHVybnMgMC4KICAgICBDb2RlQmxvY2sqIGNvZGVPcmln aW5Pd25lcigpIGNvbnN0OwotICAgIAorCiAgICAgaW50IHN0YWNrT2Zmc2V0KCkgY29uc3Q7Ci0g ICAgCisKICAgICB1bnNpZ25lZCBoYXNoKCkgY29uc3Q7CiAgICAgYm9vbCBvcGVyYXRvcj09KGNv bnN0IENvZGVPcmlnaW4mIG90aGVyKSBjb25zdDsKICAgICBib29sIG9wZXJhdG9yIT0oY29uc3Qg Q29kZU9yaWdpbiYgb3RoZXIpIGNvbnN0IHsgcmV0dXJuICEoKnRoaXMgPT0gb3RoZXIpOyB9Ci0g ICAgCisKICAgICAvLyBUaGlzIGNoZWNrcyBpZiB0aGUgdHdvIGNvZGUgb3JpZ2lucyBjb3JyZXNw b25kIHRvIHRoZSBzYW1lIHN0YWNrIHRyYWNlIHNuaXBwZXRzLAogICAgIC8vIGJ1dCBpZ25vcmUg d2hldGhlciB0aGUgSW5saW5lQ2FsbEZyYW1lJ3MgYXJlIGlkZW50aWNhbC4KICAgICBib29sIGlz QXBwcm94aW1hdGVseUVxdWFsVG8oY29uc3QgQ29kZU9yaWdpbiYgb3RoZXIsIElubGluZUNhbGxG cmFtZSogdGVybWluYWwgPSBudWxscHRyKSBjb25zdDsKLSAgICAKKwogICAgIHVuc2lnbmVkIGFw cHJveGltYXRlSGFzaChJbmxpbmVDYWxsRnJhbWUqIHRlcm1pbmFsID0gbnVsbHB0cikgY29uc3Q7 CiAKICAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgRnVuY3Rpb24+CiAgICAgdm9pZCB3YWxrVXBJbmxp bmVTdGFjayhjb25zdCBGdW5jdGlvbiYpOwotICAgIAorCiAgICAgLy8gR2V0IHRoZSBpbmxpbmUg c3RhY2suIFRoaXMgaXMgc2xvdywgYW5kIGlzIGludGVuZGVkIGZvciBkZWJ1Z2dpbmcgb25seS4K ICAgICBWZWN0b3I8Q29kZU9yaWdpbj4gaW5saW5lU3RhY2soKSBjb25zdDsKLSAgICAKKwogICAg IEpTX0VYUE9SVF9QUklWQVRFIHZvaWQgZHVtcChQcmludFN0cmVhbSYpIGNvbnN0OwogICAgIHZv aWQgZHVtcEluQ29udGV4dChQcmludFN0cmVhbSYsIER1bXBDb250ZXh0KikgY29uc3Q7CiAKICAg ICB1bnNpZ25lZCBieXRlY29kZUluZGV4KCkgY29uc3QKICAgICB7Ci0jaWYgQ1BVKEFERFJFU1M2 NCkKKyNpZiBVU0UoQ09NUFJFU1NFRF9DT0RFX09SSUdJTikKICAgICAgICAgaWYgKCFpc1NldCgp KQogICAgICAgICAgICAgcmV0dXJuIHNfaW52YWxpZEJ5dGVjb2RlSW5kZXg7CiAgICAgICAgIGlm IChVTkxJS0VMWShpc091dE9mTGluZSgpKSkKQEAgLTE4Miw3ICsxODQsNyBAQCBwdWJsaWM6CiAK ICAgICBJbmxpbmVDYWxsRnJhbWUqIGlubGluZUNhbGxGcmFtZSgpIGNvbnN0CiAgICAgewotI2lm IENQVShBRERSRVNTNjQpCisjaWYgVVNFKENPTVBSRVNTRURfQ09ERV9PUklHSU4pCiAgICAgICAg IGlmIChVTkxJS0VMWShpc091dE9mTGluZSgpKSkKICAgICAgICAgICAgIHJldHVybiBvdXRPZkxp bmVDb2RlT3JpZ2luKCktPmlubGluZUNhbGxGcmFtZTsKICAgICAgICAgcmV0dXJuIGJpdHdpc2Vf Y2FzdDxJbmxpbmVDYWxsRnJhbWUqPihtX2NvbXBvc2l0ZVZhbHVlICYgc19tYXNrQ29tcG9zaXRl VmFsdWVGb3JQb2ludGVyKTsKQEAgLTE5NCw3ICsxOTYsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgog ICAgIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQgc19pbnZhbGlkQnl0ZWNvZGVJbmRleCA9IFVJ TlRfTUFYOwogCi0jaWYgQ1BVKEFERFJFU1M2NCkKKyNpZiBVU0UoQ09NUFJFU1NFRF9DT0RFX09S SUdJTikKICAgICBzdGF0aWMgY29uc3RleHByIHVpbnRwdHJfdCBzX21hc2tJc091dE9mTGluZSA9 IDE7CiAgICAgc3RhdGljIGNvbnN0ZXhwciB1aW50cHRyX3Qgc19tYXNrSXNCeXRlY29kZUluZGV4 SW52YWxpZCA9IDI7CiAKQEAgLTIwMywxNCArMjA1LDE0IEBAIHByaXZhdGU6CiAgICAgcHVibGlj OgogICAgICAgICBJbmxpbmVDYWxsRnJhbWUqIGlubGluZUNhbGxGcmFtZTsKICAgICAgICAgdW5z aWduZWQgYnl0ZWNvZGVJbmRleDsKLSAgICAgICAgCisKICAgICAgICAgT3V0T2ZMaW5lQ29kZU9y aWdpbihJbmxpbmVDYWxsRnJhbWUqIGlubGluZUNhbGxGcmFtZSwgdW5zaWduZWQgYnl0ZWNvZGVJ bmRleCkKICAgICAgICAgICAgIDogaW5saW5lQ2FsbEZyYW1lKGlubGluZUNhbGxGcmFtZSkKICAg ICAgICAgICAgICwgYnl0ZWNvZGVJbmRleChieXRlY29kZUluZGV4KQogICAgICAgICB7CiAgICAg ICAgIH0KICAgICB9OwotICAgIAorCiAgICAgYm9vbCBpc091dE9mTGluZSgpIGNvbnN0CiAgICAg ewogICAgICAgICByZXR1cm4gbV9jb21wb3NpdGVWYWx1ZSAmIHNfbWFza0lzT3V0T2ZMaW5lOwpA QCAtMjI1LDIxICsyMjcsMjIgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgSW5saW5lQ2FsbEZyYW1l KiBkZWxldGVkTWFya2VyKCkKICAgICB7CiAgICAgICAgIGF1dG8gdmFsdWUgPSBzdGF0aWNfY2Fz dDx1aW50cHRyX3Q+KDEgPDwgMyk7Ci0jaWYgQ1BVKEFERFJFU1M2NCkKKyNpZiBVU0UoQ09NUFJF U1NFRF9DT0RFX09SSUdJTikKICAgICAgICAgQVNTRVJUKHZhbHVlICYgc19tYXNrQ29tcG9zaXRl VmFsdWVGb3JQb2ludGVyKTsKICAgICAgICAgQVNTRVJUKCEodmFsdWUgJiB+c19tYXNrQ29tcG9z aXRlVmFsdWVGb3JQb2ludGVyKSk7CiAjZW5kaWYKICAgICAgICAgcmV0dXJuIGJpdHdpc2VfY2Fz dDxJbmxpbmVDYWxsRnJhbWUqPih2YWx1ZSk7CiAgICAgfQogCi0jaWYgQ1BVKFg4Nl82NCkgJiYg Q1BVKEFERFJFU1M2NCkKKyNpZiBVU0UoQ09NUFJFU1NFRF9DT0RFX09SSUdJTikKKyNpZiBDUFUo WDg2XzY0KQogICAgIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQgc19mcmVlQml0c0F0VG9wID0g MTY7CiAgICAgc3RhdGljIGNvbnN0ZXhwciB1aW50cHRyX3Qgc19tYXNrQ29tcG9zaXRlVmFsdWVG b3JQb2ludGVyID0gMHgwMDAwZmZmZmZmZmZmZmY4OwotI2VsaWYgQ1BVKEFSTTY0KSAmJiBDUFUo QUREUkVTUzY0KQorI2VsaWYgQ1BVKEFSTTY0KQogICAgIHN0YXRpYyBjb25zdGV4cHIgdW5zaWdu ZWQgc19mcmVlQml0c0F0VG9wID0gMjg7CiAgICAgc3RhdGljIGNvbnN0ZXhwciB1aW50cHRyX3Qg c19tYXNrQ29tcG9zaXRlVmFsdWVGb3JQb2ludGVyID0gMHgwMDAwMDAwZmZmZmZmZmY4OwotI2Vu ZGlmCi0jaWYgQ1BVKEFERFJFU1M2NCkKKyNlbmRpZiAvLyBDUFUoWDg2XzY0KQorCiAgICAgc3Rh dGljIHVpbnRwdHJfdCBidWlsZENvbXBvc2l0ZVZhbHVlKElubGluZUNhbGxGcmFtZSogaW5saW5l Q2FsbEZyYW1lLCB1bnNpZ25lZCBieXRlY29kZUluZGV4KQogICAgIHsKICAgICAgICAgaWYgKGJ5 dGVjb2RlSW5kZXggPT0gc19pbnZhbGlkQnl0ZWNvZGVJbmRleCkKQEAgLTI3Niw3ICsyNzksNyBA QCBpbmxpbmUgdW5zaWduZWQgQ29kZU9yaWdpbjo6aGFzaCgpIGNvbnN0CiAKIGlubGluZSBib29s IENvZGVPcmlnaW46Om9wZXJhdG9yPT0oY29uc3QgQ29kZU9yaWdpbiYgb3RoZXIpIGNvbnN0CiB7 Ci0jaWYgQ1BVKEFERFJFU1M2NCkKKyNpZiBVU0UoQ09NUFJFU1NFRF9DT0RFX09SSUdJTikKICAg ICBpZiAobV9jb21wb3NpdGVWYWx1ZSA9PSBvdGhlci5tX2NvbXBvc2l0ZVZhbHVlKQogICAgICAg ICByZXR1cm4gdHJ1ZTsKICNlbmRpZgo= 365594 2019-03-21 12:45:15 -0700 2019-03-21 22:56:08 -0700 Patch bug-196072-20190321204513.patch text/plain 1914 tpopela U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzMjc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw Mzc1M2U3ZWJkMTNlOTViYjgyZDlkMWEyYTBlOTNjM2Y5YWE5YjUwLi5jMDBhOTJhNDIyZmRlNGZl NTQzMTJkZTc3NjdlYTA1ZjkyZjQ5Mjk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxOS0wMy0yMSAgVG9tYXMgUG9wZWxhICA8dHBvcGVsYUByZWRoYXQuY29t PgorCisgICAgICAgIFtKU0NdIEZpeCBidWlsZCBhZnRlciByMjQzMjMyIG9uIHVuc3VwcG9ydGVk IDY0Yml0IGFyY2hpdGVjdHVyZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5NjA3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFzIEtlaXRoIHN1Z2dlc3RlZCB3ZSBhbHJlYWR5IGV4cGVjdCAxNiBmcmVl IGJpdHMgYXQgdGhlIHRvcCBvZiBhbnkKKyAgICAgICAgcG9pbnRlciBmb3IgSlNWYWx1ZSBldmVu IGZvciB0aGUgdW5zdXBwb3J0ZWQgNjQgYml0IGFyY2hlcy4KKworICAgICAgICAqIGJ5dGVjb2Rl L0NvZGVPcmlnaW4uaDoKKwogMjAxOS0wMy0yMCAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxl LmNvbT4KIAogICAgICAgICBERkc6OkFic3RyYWN0VmFsdWU6OnZhbGlkYXRlT1NSRW50cnkgaXMg d3Jvbmcgd2hlbiBpc0hlYXBUb3AgYW5kIHRoZSBpbmNvbWluZyB2YWx1ZSBpcyBFbXB0eQpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVPcmlnaW4uaCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlT3JpZ2luLmgKaW5kZXggODA0ZDM1MTY0 Njk2YThlZTM0ZmE3NjQ0MWUzM2ZmYjg0ODhjNTRkNS4uNTUxZmJlYzBmN2E0ZjMwOTI2YzRlNmZk ZjQ2NWRkZDgxY2QwZTU4NCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj b2RlL0NvZGVPcmlnaW4uaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29k ZU9yaWdpbi5oCkBAIC0yMzIsMTIgKzIzMiwxMiBAQCBwcml2YXRlOgogICAgICAgICByZXR1cm4g Yml0d2lzZV9jYXN0PElubGluZUNhbGxGcmFtZSo+KHZhbHVlKTsKICAgICB9CiAKLSNpZiBDUFUo WDg2XzY0KSAmJiBDUFUoQUREUkVTUzY0KQotICAgIHN0YXRpYyBjb25zdGV4cHIgdW5zaWduZWQg c19mcmVlQml0c0F0VG9wID0gMTY7Ci0gICAgc3RhdGljIGNvbnN0ZXhwciB1aW50cHRyX3Qgc19t YXNrQ29tcG9zaXRlVmFsdWVGb3JQb2ludGVyID0gMHgwMDAwZmZmZmZmZmZmZmY4OwotI2VsaWYg Q1BVKEFSTTY0KSAmJiBDUFUoQUREUkVTUzY0KQorI2lmIENQVShBUk02NCkgJiYgQ1BVKEFERFJF U1M2NCkKICAgICBzdGF0aWMgY29uc3RleHByIHVuc2lnbmVkIHNfZnJlZUJpdHNBdFRvcCA9IDI4 OwogICAgIHN0YXRpYyBjb25zdGV4cHIgdWludHB0cl90IHNfbWFza0NvbXBvc2l0ZVZhbHVlRm9y UG9pbnRlciA9IDB4MDAwMDAwMGZmZmZmZmZmODsKKyNlbGlmIENQVShBRERSRVNTNjQpCisgICAg c3RhdGljIGNvbnN0ZXhwciB1bnNpZ25lZCBzX2ZyZWVCaXRzQXRUb3AgPSAxNjsKKyAgICBzdGF0 aWMgY29uc3RleHByIHVpbnRwdHJfdCBzX21hc2tDb21wb3NpdGVWYWx1ZUZvclBvaW50ZXIgPSAw eDAwMDBmZmZmZmZmZmZmZjg7CiAjZW5kaWYKICNpZiBDUFUoQUREUkVTUzY0KQogICAgIHN0YXRp YyB1aW50cHRyX3QgYnVpbGRDb21wb3NpdGVWYWx1ZShJbmxpbmVDYWxsRnJhbWUqIGlubGluZUNh bGxGcmFtZSwgdW5zaWduZWQgYnl0ZWNvZGVJbmRleCkK