154125 2016-02-11 13:19:18 -0800 Need WTFCrash workaround for shipping SafariForWebKitDevelopment binaries. 2016-02-11 17:00:50 -0800 1 1 1 Unclassified WebKit Web Template Framework WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam benjamin cdumez cmarcelo commit-queue ggaren hi joepeck oldest_to_newest 1163836 0 mark.lam 2016-02-11 13:19:18 -0800 Presently shipping SafariForWebKitDevelopment binaries still expect to link to a WTFCrash function. We need to provide this function as a workaround until we can update SafariForWebKitDevelopment to use the new inlined version. 1163843 1 271079 mark.lam 2016-02-11 13:25:20 -0800 Created attachment 271079 proposed patch. 1163904 2 271079 bburg 2016-02-11 15:06:18 -0800 Comment on attachment 271079 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=271079&action=review > Source/WTF/wtf/Assertions.cpp:507 > +// This is a workaround for presently shipping (crica early 2016) SafariForWebKitDevelopment Nit: 'circa' 1163906 3 271079 mark.lam 2016-02-11 15:11:59 -0800 Comment on attachment 271079 proposed patch. I've talked with Geoff offline, and am going to re-implement this in a hopefully cleaner way. Stay tuned. 1163928 4 271103 mark.lam 2016-02-11 16:25:38 -0800 Created attachment 271103 proposed patch 2 based on Geoff's suggestion. 1163936 5 271103 joepeck 2016-02-11 16:40:19 -0800 Comment on attachment 271103 proposed patch 2 based on Geoff's suggestion. View in context: https://bugs.webkit.org/attachment.cgi?id=271103&action=review > Source/WTF/wtf/Assertions.h:157 > +ALWAYS_INLINE NO_RETURN_DUE_TO_CRASH void CRASH() It doesn't seem proper to introduce a new symbol into the global namespace that is not WTF prefixed. All other symbols in WTF introduces in Assertions.h/cpp are prefixed by "WTF". Can CRASH stay a macro, but just call to WTFCrashImpl()? > Source/WTF/wtf/Assertions.h:177 > +#else /* not defined(NDEBUG) && OS(DARWIN) */ > + > +WTF_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH void WTFCrashImpl(); > +#define CRASH() WTFCrashImpl() And it would be pretty confusing for CRASH to be a macro on some ports, but a symbol on others. It would be nice to be consistent. 1163938 6 271107 mark.lam 2016-02-11 16:47:10 -0800 Created attachment 271107 proposed patch 3 with Joe's feedback. 1163944 7 271107 mark.lam 2016-02-11 16:55:13 -0800 Comment on attachment 271107 proposed patch 3 with Joe's feedback. Will commit manually. 1163946 8 mark.lam 2016-02-11 17:00:50 -0800 Thanks for the review. Landed in r196458: <http://trac.webkit.org/r196458>. 271079 2016-02-11 13:25:20 -0800 2016-02-11 16:25:38 -0800 proposed patch. bug-154125.patch text/plain 2312 mark.lam SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxOTY0MzIpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE2LTAyLTExICBNYXJrIExhbSAgPG1hcmsubGFt QGFwcGxlLmNvbT4KKworICAgICAgICBOZWVkIFdURkNyYXNoIHdvcmthcm91bmQgZm9yIHNoaXBw aW5nIFNhZmFyaUZvcldlYktpdERldmVsb3BtZW50IGJpbmFyaWVzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0MTI1CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHJlc2VudGx5IHNoaXBwaW5nIFNhZmFy aUZvcldlYktpdERldmVsb3BtZW50IGJpbmFyaWVzIHN0aWxsIGV4cGVjdCB0byBsaW5rIHRvIGEK KyAgICAgICAgV1RGQ3Jhc2ggZnVuY3Rpb24uICBXZSBuZWVkIHRvIHByb3ZpZGUgdGhpcyBmdW5j dGlvbiBhcyBhIHdvcmthcm91bmQgdW50aWwgd2UgY2FuCisgICAgICAgIHVwZGF0ZSBTYWZhcmlG b3JXZWJLaXREZXZlbG9wbWVudCB0byB1c2UgdGhlIG5ldyBpbmxpbmVkIHZlcnNpb24uCisKKyAg ICAgICAgKiB3dGYvQXNzZXJ0aW9ucy5jcHA6CisgICAgICAgICogd3RmL0Fzc2VydGlvbnMuaDoK KwogMjAxNi0wMi0wOSAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAg Q2hhbmdlZCBXVEZDcmFzaCB0byBub3QgdHJhc2ggdGhlIGNyYXNoIHNpdGUgcmVnaXN0ZXIgc3Rh dGUuCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9Bc3NlcnRpb25zLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV1RGL3d0Zi9Bc3NlcnRpb25zLmNwcAkocmV2aXNpb24gMTk2NDMxKQorKysgU291cmNl L1dURi93dGYvQXNzZXJ0aW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUwMyw0ICs1MDMsMTUg QEAgdm9pZCBXVEZJbml0aWFsaXplTG9nQ2hhbm5lbFN0YXRlc0Zyb21TdAogICAgIH0KIH0KIAor I2lmIGRlZmluZWQoTkRFQlVHKSAmJiBPUyhEQVJXSU4pCisvLyBUaGlzIGlzIGEgd29ya2Fyb3Vu ZCBmb3IgcHJlc2VudGx5IHNoaXBwaW5nIChjcmljYSBlYXJseSAyMDE2KSBTYWZhcmlGb3JXZWJL aXREZXZlbG9wbWVudAorLy8gYmluYXJpZXMgd2hpY2ggc3RpbGwgZXhwZWN0cyB0byBsaW5rIHRv IGEgV1RGQ3Jhc2goKSBmdW5jdGlvbi4KKyN1bmRlZiBXVEZDcmFzaAorV1RGX0VYUE9SVF9QUklW QVRFIE5PX1JFVFVSTl9EVUVfVE9fQ1JBU0ggdm9pZCBXVEZDcmFzaCgpOwordm9pZCBXVEZDcmFz aCgpCit7CisgICAgV1RGSGFuZGxlQ3Jhc2goKTsKK30KKyNlbmRpZiAvLyBkZWZpbmVkKE5ERUJV RykgJiYgT1MoREFSV0lOKQorCiB9IC8vIGV4dGVybiAiQyIKSW5kZXg6IFNvdXJjZS9XVEYvd3Rm L0Fzc2VydGlvbnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9Bc3NlcnRpb25zLmgJ KHJldmlzaW9uIDE5NjQzMSkKKysrIFNvdXJjZS9XVEYvd3RmL0Fzc2VydGlvbnMuaAkod29ya2lu ZyBjb3B5KQpAQCAtMTYzLDcgKzE2Myw3IEBAIFdURl9FWFBPUlRfUFJJVkFURSBib29sIFdURklz RGVidWdnZXJBdHQKIGV4dGVybiAiQyIgewogI2VuZGlmCiAjaWYgZGVmaW5lZChOREVCVUcpICYm IE9TKERBUldJTikKLUFMV0FZU19JTkxJTkUgTk9fUkVUVVJOX0RVRV9UT19DUkFTSCB2b2lkIFdU RkNyYXNoKCkKK0FMV0FZU19JTkxJTkUgTk9fUkVUVVJOX0RVRV9UT19DUkFTSCB2b2lkIFdURkhh bmRsZUNyYXNoKCkKIHsKICAgICAvLyBDcmFzaCB3aXRoIGEgU0lHVFJBUCBpLmUgRVhDX0JSRUFL UE9JTlQuCiAgICAgLy8gV2UgYXJlIG5vdCB1c2luZyBfX2J1aWx0aW5fdHJhcCBiZWNhdXNlIGl0 IGlzIG9ubHkgZ3VhcmFudGVlZCB0byBhYm9ydCwgYnV0IG5vdCBuZWNlc3NhcmlseQpAQCAtMTc5 LDYgKzE3OSw3IEBAIEFMV0FZU19JTkxJTkUgTk9fUkVUVVJOX0RVRV9UT19DUkFTSCB2b2kKICNl bmRpZgogICAgIF9fYnVpbHRpbl91bnJlYWNoYWJsZSgpOwogfQorI2RlZmluZSBXVEZDcmFzaCBX VEZIYW5kbGVDcmFzaAogI2Vsc2UKIFdURl9FWFBPUlRfUFJJVkFURSBOT19SRVRVUk5fRFVFX1RP X0NSQVNIIHZvaWQgV1RGQ3Jhc2goKTsKICNlbmRpZgo= 271103 2016-02-11 16:25:38 -0800 2016-02-11 16:47:10 -0800 proposed patch 2 based on Geoff's suggestion. bug-154125.patch text/plain 4739 mark.lam SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxOTY0MzIpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE2LTAyLTExICBNYXJrIExhbSAgPG1hcmsubGFt QGFwcGxlLmNvbT4KKworICAgICAgICBOZWVkIFdURkNyYXNoIHdvcmthcm91bmQgZm9yIHNoaXBw aW5nIFNhZmFyaUZvcldlYktpdERldmVsb3BtZW50IGJpbmFyaWVzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0MTI1CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHJlc2VudGx5IHNoaXBwaW5nIFNhZmFy aUZvcldlYktpdERldmVsb3BtZW50IGJpbmFyaWVzIHN0aWxsIGV4cGVjdCB0byBsaW5rIHRvIGEK KyAgICAgICAgV1RGQ3Jhc2ggZnVuY3Rpb24uICBXZSBuZWVkIHRvIHByb3ZpZGUgdGhpcyBmdW5j dGlvbiBhcyBhIHdvcmthcm91bmQgdW50aWwgd2UgY2FuCisgICAgICAgIHVwZGF0ZSBTYWZhcmlG b3JXZWJLaXREZXZlbG9wbWVudCB0byB1c2UgdGhlIG5ldyBpbmxpbmVkIHZlcnNpb24uCisKKyAg ICAgICAgV2UgZG8gdGhpcyBieSBkb2luZzoKKyAgICAgICAgMS4gTWFrZSBDUkFTSCgpIHRoZSBz b2xlIGRlY2lzaW9uIG1ha2VyIG9uIGhvdyB0byBjcmFzaC4KKyAgICAgICAgMi4gUmVuYW1lZCB0 aGUgbGVnYWN5IFdURkNyYXNoKCkgdG8gV1RGQ3Jhc2hJbXBsKCkuCisgICAgICAgICAgIEZvciBk ZWJ1ZyBvciBub24tRGFyd2luIGJ1aWxkcywgQ1JBU0goKSB3aWxsIGJlIGRlZmluZWQgYXMgV1RG Q3Jhc2hJbXBsKCkuCisgICAgICAgICAgIEVsc2UsIENSQVNIKCkgd2lsbCBiZSBhbiBpbmxpbmVk IGFzbSBzdGF0ZW1lbnQgdGhhdCBpc3N1ZXMgYSBicmVha3BvaW50IHRyYXAuCisgICAgICAgIDMu IEltcGxlbWVudCBXVEZDcmFzaCgpIGFzIGEgZnVuY3Rpb24gdGhhdCBjYWxscyBDUkFTSCgpLgor ICAgICAgICAgICBUaGlzIHNhdGlzZmllcyB0aGUgbmVlZCBvZiBzaGlwcGluZyBTYWZhcmlGb3JX ZWJLaXREZXZlbG9wbWVudCBiaW5hcmllcy4KKyAgICAgICAgNC4gQ2hhbmdlIFdURkNyYXNoV2l0 aFNlY3VyaXR5SW1wbGljYXRpb24oKSB0byBjYWxsIENSQVNIKCkuCisgICAgICAgICAgIFRoaXMg ZW5zdXJlcyB0aGF0IHdlIGhhdmUgYSBjb25zaXN0ZW50IGltcGxlbWVudGF0aW9uIG9mIGhvdyB3 ZSBjcmFzaC4KKyAgICAgICAgNS4gQ2hhbmdlZCBXVEZMb2dBbHdheXNBbmRDcmFzaCgpIHRvIGNh bGwgQ1JBU0goKSBpbnN0ZWFkIG9mIFdURkNyYXNoKCkuCisgICAgICAgICAgIFRoaXMgaXMganVz dCB0byBoYXZlIGNvbnNpc3RlbmN5IGluIHRoYXQgYWxsIGNvZGUgaW4gdGhlIFdlYktpdCBwcm9q ZWN0CisgICAgICAgICAgIG5vdyBjcmFzaGVzIGJ5IGNhbGxpbmcgQ1JBU0goKSwgbm90IFdURkNy YXNoKCkuCisKKyAgICAgICAgKiB3dGYvQXNzZXJ0aW9ucy5jcHA6CisgICAgICAgICogd3RmL0Fz c2VydGlvbnMuaDoKKwogMjAxNi0wMi0wOSAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+ CiAKICAgICAgICAgQ2hhbmdlZCBXVEZDcmFzaCB0byBub3QgdHJhc2ggdGhlIGNyYXNoIHNpdGUg cmVnaXN0ZXIgc3RhdGUuCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9Bc3NlcnRpb25zLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9Bc3NlcnRpb25zLmNwcAkocmV2aXNpb24gMTk2NDMx KQorKysgU291cmNlL1dURi93dGYvQXNzZXJ0aW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMx Myw3ICszMTMsNyBAQCB2b2lkIFdURlNldENyYXNoSG9vayhXVEZDcmFzaEhvb2tGdW5jdGlvCiB9 CiAKICNpZiAhZGVmaW5lZChOREVCVUcpIHx8ICFPUyhEQVJXSU4pCi12b2lkIFdURkNyYXNoKCkK K3ZvaWQgV1RGQ3Jhc2hJbXBsKCkKIHsKICAgICBpZiAoZ2xvYmFsSG9vaykKICAgICAgICAgZ2xv YmFsSG9vaygpOwpAQCAtMzI5LDE4ICszMjksMTcgQEAgdm9pZCBXVEZDcmFzaCgpCiB9CiAjZW5k aWYgLy8gIWRlZmluZWQoTkRFQlVHKSB8fCAhT1MoREFSV0lOKQogICAgIAorLy8gV2UgbmVlZCB0 byBrZWVwIFdURkNyYXNoKCkgYXJvdW5kIChldmVuIG9uIG5vbi1kZWJ1ZyBPUyhEQVJXSU4pIGJ1 aWxkcykgYXMgYSB3b3JrYXJvdW5kCisvLyBmb3IgcHJlc2VudGx5IHNoaXBwaW5nIChjaXJjYSBl YXJseSAyMDE2KSBTYWZhcmlGb3JXZWJLaXREZXZlbG9wbWVudCBiaW5hcmllcyB3aGljaCBzdGls bAorLy8gZXhwZWN0cyB0byBsaW5rIHRvIGl0Lgordm9pZCBXVEZDcmFzaCgpCit7CisgICAgQ1JB U0goKTsKK30KKwogdm9pZCBXVEZDcmFzaFdpdGhTZWN1cml0eUltcGxpY2F0aW9uKCkKIHsKLSAg ICBpZiAoZ2xvYmFsSG9vaykKLSAgICAgICAgZ2xvYmFsSG9vaygpOwotICAgIFdURlJlcG9ydEJh Y2t0cmFjZSgpOwotICAgICooaW50ICopKHVpbnRwdHJfdCkweGZiYWRiZWVmID0gMDsKLSAgICAv LyBNb3JlIHJlbGlhYmxlLCBidXQgZG9lc24ndCBzYXkgZmJhZGJlZWYuCi0jaWYgQ09NUElMRVIo R0NDX09SX0NMQU5HKQotICAgIF9fYnVpbHRpbl90cmFwKCk7Ci0jZWxzZQotICAgICgodm9pZCgq KSgpKTApKCk7Ci0jZW5kaWYKKyAgICBDUkFTSCgpOwogfQogCiAjaWYgSEFWRShTSUdOQUxfSCkK QEAgLTQ1Niw3ICs0NTUsNyBAQCB2b2lkIFdURkxvZ0Fsd2F5c0FuZENyYXNoKGNvbnN0IGNoYXIq IGZvCiAgICAgdmFfc3RhcnQoYXJncywgZm9ybWF0KTsKICAgICBXVEZMb2dBbHdheXNWKGZvcm1h dCwgYXJncyk7CiAgICAgdmFfZW5kKGFyZ3MpOwotICAgIFdURkNyYXNoKCk7CisgICAgQ1JBU0go KTsKIH0KIAogV1RGTG9nQ2hhbm5lbCogV1RGTG9nQ2hhbm5lbEJ5TmFtZShXVEZMb2dDaGFubmVs KiBjaGFubmVsc1tdLCBzaXplX3QgY291bnQsIGNvbnN0IGNoYXIqIG5hbWUpCkluZGV4OiBTb3Vy Y2UvV1RGL3d0Zi9Bc3NlcnRpb25zLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvQXNz ZXJ0aW9ucy5oCShyZXZpc2lvbiAxOTY0MzEpCisrKyBTb3VyY2UvV1RGL3d0Zi9Bc3NlcnRpb25z LmgJKHdvcmtpbmcgY29weSkKQEAgLTE1MCwyMCArMTUwLDExIEBAIFdURl9FWFBPUlRfUFJJVkFU RSB2b2lkIFdURlNldENyYXNoSG9vaygKIFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIFdURkluc3Rh bGxSZXBvcnRCYWNrdHJhY2VPbkNyYXNoSG9vaygpOwogCiBXVEZfRVhQT1JUX1BSSVZBVEUgYm9v bCBXVEZJc0RlYnVnZ2VyQXR0YWNoZWQoKTsKLQotI2lmZGVmIF9fY3BsdXNwbHVzCi19Ci0jZW5k aWYKLQorICAgIAogI2lmbmRlZiBDUkFTSAotI2RlZmluZSBDUkFTSCgpIFdURkNyYXNoKCkKLSNl bmRpZgotCi0jaWZkZWYgX19jcGx1c3BsdXMKLWV4dGVybiAiQyIgewotI2VuZGlmCiAjaWYgZGVm aW5lZChOREVCVUcpICYmIE9TKERBUldJTikKLUFMV0FZU19JTkxJTkUgTk9fUkVUVVJOX0RVRV9U T19DUkFTSCB2b2lkIFdURkNyYXNoKCkKKworQUxXQVlTX0lOTElORSBOT19SRVRVUk5fRFVFX1RP X0NSQVNIIHZvaWQgQ1JBU0goKQogewogICAgIC8vIENyYXNoIHdpdGggYSBTSUdUUkFQIGkuZSBF WENfQlJFQUtQT0lOVC4KICAgICAvLyBXZSBhcmUgbm90IHVzaW5nIF9fYnVpbHRpbl90cmFwIGJl Y2F1c2UgaXQgaXMgb25seSBndWFyYW50ZWVkIHRvIGFib3J0LCBidXQgbm90IG5lY2Vzc2FyaWx5 CkBAIC0xNzksMjIgKzE3MCwyNCBAQCBBTFdBWVNfSU5MSU5FIE5PX1JFVFVSTl9EVUVfVE9fQ1JB U0ggdm9pCiAjZW5kaWYKICAgICBfX2J1aWx0aW5fdW5yZWFjaGFibGUoKTsKIH0KLSNlbHNlCi1X VEZfRVhQT1JUX1BSSVZBVEUgTk9fUkVUVVJOX0RVRV9UT19DUkFTSCB2b2lkIFdURkNyYXNoKCk7 Ci0jZW5kaWYKIAotI2lmZGVmIF9fY3BsdXNwbHVzCi19Ci0jZW5kaWYKKyNlbHNlIC8qIG5vdCBk ZWZpbmVkKE5ERUJVRykgJiYgT1MoREFSV0lOKSAqLworCitXVEZfRVhQT1JUX1BSSVZBVEUgTk9f UkVUVVJOX0RVRV9UT19DUkFTSCB2b2lkIFdURkNyYXNoSW1wbCgpOworI2RlZmluZSBDUkFTSCgp IFdURkNyYXNoSW1wbCgpCisKKyNlbmRpZiAvKiBkZWZpbmVkKE5ERUJVRykgJiYgT1MoREFSV0lO KSAqLworCisjZW5kaWYgLyogQ1JBU0ggKi8KKworV1RGX0VYUE9SVF9QUklWQVRFIE5PX1JFVFVS Tl9EVUVfVE9fQ1JBU0ggdm9pZCBXVEZDcmFzaCgpOwogCiAjaWZuZGVmIENSQVNIX1dJVEhfU0VD VVJJVFlfSU1QTElDQVRJT04KICNkZWZpbmUgQ1JBU0hfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElP TigpIFdURkNyYXNoV2l0aFNlY3VyaXR5SW1wbGljYXRpb24oKQogI2VuZGlmCiAKLSNpZmRlZiBf X2NwbHVzcGx1cwotZXh0ZXJuICJDIiB7Ci0jZW5kaWYKLSAgICBXVEZfRVhQT1JUX1BSSVZBVEUg Tk9fUkVUVVJOX0RVRV9UT19DUkFTSCB2b2lkIFdURkNyYXNoV2l0aFNlY3VyaXR5SW1wbGljYXRp b24oKTsKK1dURl9FWFBPUlRfUFJJVkFURSBOT19SRVRVUk5fRFVFX1RPX0NSQVNIIHZvaWQgV1RG Q3Jhc2hXaXRoU2VjdXJpdHlJbXBsaWNhdGlvbigpOworCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0K ICNlbmRpZgo= 271107 2016-02-11 16:47:10 -0800 2016-02-11 16:55:13 -0800 proposed patch 3 with Joe's feedback. bug-154125.patch text/plain 4657 mark.lam SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxOTY0MzIpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE2LTAyLTExICBNYXJrIExhbSAgPG1hcmsubGFt QGFwcGxlLmNvbT4KKworICAgICAgICBOZWVkIFdURkNyYXNoIHdvcmthcm91bmQgZm9yIHNoaXBw aW5nIFNhZmFyaUZvcldlYktpdERldmVsb3BtZW50IGJpbmFyaWVzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0MTI1CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHJlc2VudGx5IHNoaXBwaW5nIFNhZmFy aUZvcldlYktpdERldmVsb3BtZW50IGJpbmFyaWVzIHN0aWxsIGV4cGVjdCB0byBsaW5rIHRvIGEK KyAgICAgICAgV1RGQ3Jhc2ggZnVuY3Rpb24uICBXZSBuZWVkIHRvIHByb3ZpZGUgdGhpcyBmdW5j dGlvbiBhcyBhIHdvcmthcm91bmQgdW50aWwgd2UgY2FuCisgICAgICAgIHVwZGF0ZSBTYWZhcmlG b3JXZWJLaXREZXZlbG9wbWVudCB0byB1c2UgdGhlIG5ldyBpbmxpbmVkIHZlcnNpb24uCisKKyAg ICAgICAgV2UgZG8gdGhpcyBieSBkb2luZzoKKyAgICAgICAgMS4gTWFrZSBXVEZDcmFzaEltcGwo KSB0aGUgc29sZSBmdW5jdGlvbiBmb3IgaW1wbGVtZW50aW5nIGEgY3Jhc2guCisgICAgICAgICAg IFRoZSBDUkFTSCgpIG1hY3JvIGlzIG5vdyBkZWZpbmVkIHRvIGJlIFdURkNyYXNoSW1wbCgpIGlu c3RlYWQgb2YgV1RGQ3Jhc2goKS4KKyAgICAgICAgMi4gUmVuYW1lZCB0aGUgbGVnYWN5IFdURkNy YXNoKCkgdG8gV1RGQ3Jhc2hJbXBsKCkgZm9yIGRlYnVnIG9yIG5vbi1EYXJ3aW4gYnVpbGRzLgor ICAgICAgICAgICBGb3IgKG5vbi1kZWJ1ZyAmJiBPUyhEQVJXSU4pKSBidWlsZHMsIFdURkNyYXNo SW1wbCgpIHdpbGwgYmUgYW4gaW5saW5lZAorICAgICAgICAgICBmdW5jdGlvbiB3aXRoIGFuIGFz bSBzdGF0ZW1lbnQgdGhhdCBpc3N1ZXMgYSBicmVha3BvaW50IHRyYXAuCisgICAgICAgIDMuIElt cGxlbWVudCBXVEZDcmFzaCgpIGFzIGEgZnVuY3Rpb24gdGhhdCBjYWxscyBDUkFTSCgpLgorICAg ICAgICAgICBUaGlzIHNhdGlzZmllcyB0aGUgbmVlZCBvZiBzaGlwcGluZyBTYWZhcmlGb3JXZWJL aXREZXZlbG9wbWVudCBiaW5hcmllcy4KKyAgICAgICAgNC4gQ2hhbmdlIFdURkNyYXNoV2l0aFNl Y3VyaXR5SW1wbGljYXRpb24oKSB0byBjYWxsIENSQVNIKCkuCisgICAgICAgICAgIFRoaXMgZW5z dXJlcyB0aGF0IHdlIGhhdmUgYSBjb25zaXN0ZW50IGltcGxlbWVudGF0aW9uIG9mIGhvdyB3ZSBj cmFzaC4KKyAgICAgICAgNS4gQ2hhbmdlZCBXVEZMb2dBbHdheXNBbmRDcmFzaCgpIHRvIGNhbGwg Q1JBU0goKSBpbnN0ZWFkIG9mIFdURkNyYXNoKCkuCisgICAgICAgICAgIFRoaXMgaXMganVzdCB0 byBoYXZlIGNvbnNpc3RlbmN5IGluIHRoYXQgYWxsIGNvZGUgaW4gdGhlIFdlYktpdCBwcm9qZWN0 CisgICAgICAgICAgIG5vdyBjcmFzaGVzIGJ5IGNhbGxpbmcgQ1JBU0goKSwgbm90IFdURkNyYXNo KCkuCisKKyAgICAgICAgKiB3dGYvQXNzZXJ0aW9ucy5jcHA6CisgICAgICAgICogd3RmL0Fzc2Vy dGlvbnMuaDoKKwogMjAxNi0wMi0wOSAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAK ICAgICAgICAgQ2hhbmdlZCBXVEZDcmFzaCB0byBub3QgdHJhc2ggdGhlIGNyYXNoIHNpdGUgcmVn aXN0ZXIgc3RhdGUuCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9Bc3NlcnRpb25zLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9Bc3NlcnRpb25zLmNwcAkocmV2aXNpb24gMTk2NDMxKQor KysgU291cmNlL1dURi93dGYvQXNzZXJ0aW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxMyw3 ICszMTMsNyBAQCB2b2lkIFdURlNldENyYXNoSG9vayhXVEZDcmFzaEhvb2tGdW5jdGlvCiB9CiAK ICNpZiAhZGVmaW5lZChOREVCVUcpIHx8ICFPUyhEQVJXSU4pCi12b2lkIFdURkNyYXNoKCkKK3Zv aWQgV1RGQ3Jhc2hJbXBsKCkKIHsKICAgICBpZiAoZ2xvYmFsSG9vaykKICAgICAgICAgZ2xvYmFs SG9vaygpOwpAQCAtMzI5LDE4ICszMjksMTcgQEAgdm9pZCBXVEZDcmFzaCgpCiB9CiAjZW5kaWYg Ly8gIWRlZmluZWQoTkRFQlVHKSB8fCAhT1MoREFSV0lOKQogICAgIAorLy8gV2UgbmVlZCB0byBr ZWVwIFdURkNyYXNoKCkgYXJvdW5kIChldmVuIG9uIG5vbi1kZWJ1ZyBPUyhEQVJXSU4pIGJ1aWxk cykgYXMgYSB3b3JrYXJvdW5kCisvLyBmb3IgcHJlc2VudGx5IHNoaXBwaW5nIChjaXJjYSBlYXJs eSAyMDE2KSBTYWZhcmlGb3JXZWJLaXREZXZlbG9wbWVudCBiaW5hcmllcyB3aGljaCBzdGlsbAor Ly8gZXhwZWN0cyB0byBsaW5rIHRvIGl0Lgordm9pZCBXVEZDcmFzaCgpCit7CisgICAgQ1JBU0go KTsKK30KKwogdm9pZCBXVEZDcmFzaFdpdGhTZWN1cml0eUltcGxpY2F0aW9uKCkKIHsKLSAgICBp ZiAoZ2xvYmFsSG9vaykKLSAgICAgICAgZ2xvYmFsSG9vaygpOwotICAgIFdURlJlcG9ydEJhY2t0 cmFjZSgpOwotICAgICooaW50ICopKHVpbnRwdHJfdCkweGZiYWRiZWVmID0gMDsKLSAgICAvLyBN b3JlIHJlbGlhYmxlLCBidXQgZG9lc24ndCBzYXkgZmJhZGJlZWYuCi0jaWYgQ09NUElMRVIoR0ND X09SX0NMQU5HKQotICAgIF9fYnVpbHRpbl90cmFwKCk7Ci0jZWxzZQotICAgICgodm9pZCgqKSgp KTApKCk7Ci0jZW5kaWYKKyAgICBDUkFTSCgpOwogfQogCiAjaWYgSEFWRShTSUdOQUxfSCkKQEAg LTQ1Niw3ICs0NTUsNyBAQCB2b2lkIFdURkxvZ0Fsd2F5c0FuZENyYXNoKGNvbnN0IGNoYXIqIGZv CiAgICAgdmFfc3RhcnQoYXJncywgZm9ybWF0KTsKICAgICBXVEZMb2dBbHdheXNWKGZvcm1hdCwg YXJncyk7CiAgICAgdmFfZW5kKGFyZ3MpOwotICAgIFdURkNyYXNoKCk7CisgICAgQ1JBU0goKTsK IH0KIAogV1RGTG9nQ2hhbm5lbCogV1RGTG9nQ2hhbm5lbEJ5TmFtZShXVEZMb2dDaGFubmVsKiBj aGFubmVsc1tdLCBzaXplX3QgY291bnQsIGNvbnN0IGNoYXIqIG5hbWUpCkluZGV4OiBTb3VyY2Uv V1RGL3d0Zi9Bc3NlcnRpb25zLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvQXNzZXJ0 aW9ucy5oCShyZXZpc2lvbiAxOTY0MzEpCisrKyBTb3VyY2UvV1RGL3d0Zi9Bc3NlcnRpb25zLmgJ KHdvcmtpbmcgY29weSkKQEAgLTE1MSwxOSArMTUxLDEyIEBAIFdURl9FWFBPUlRfUFJJVkFURSB2 b2lkIFdURkluc3RhbGxSZXBvcnQKIAogV1RGX0VYUE9SVF9QUklWQVRFIGJvb2wgV1RGSXNEZWJ1 Z2dlckF0dGFjaGVkKCk7CiAKLSNpZmRlZiBfX2NwbHVzcGx1cwotfQotI2VuZGlmCi0KICNpZm5k ZWYgQ1JBU0gKLSNkZWZpbmUgQ1JBU0goKSBXVEZDcmFzaCgpCisjZGVmaW5lIENSQVNIKCkgV1RG Q3Jhc2hJbXBsKCkKICNlbmRpZgogCi0jaWZkZWYgX19jcGx1c3BsdXMKLWV4dGVybiAiQyIgewot I2VuZGlmCiAjaWYgZGVmaW5lZChOREVCVUcpICYmIE9TKERBUldJTikKLUFMV0FZU19JTkxJTkUg Tk9fUkVUVVJOX0RVRV9UT19DUkFTSCB2b2lkIFdURkNyYXNoKCkKK0FMV0FZU19JTkxJTkUgTk9f UkVUVVJOX0RVRV9UT19DUkFTSCB2b2lkIFdURkNyYXNoSW1wbCgpCiB7CiAgICAgLy8gQ3Jhc2gg d2l0aCBhIFNJR1RSQVAgaS5lIEVYQ19CUkVBS1BPSU5ULgogICAgIC8vIFdlIGFyZSBub3QgdXNp bmcgX19idWlsdGluX3RyYXAgYmVjYXVzZSBpdCBpcyBvbmx5IGd1YXJhbnRlZWQgdG8gYWJvcnQs IGJ1dCBub3QgbmVjZXNzYXJpbHkKQEAgLTE4MCwyMSArMTczLDE3IEBAIEFMV0FZU19JTkxJTkUg Tk9fUkVUVVJOX0RVRV9UT19DUkFTSCB2b2kKICAgICBfX2J1aWx0aW5fdW5yZWFjaGFibGUoKTsK IH0KICNlbHNlCi1XVEZfRVhQT1JUX1BSSVZBVEUgTk9fUkVUVVJOX0RVRV9UT19DUkFTSCB2b2lk IFdURkNyYXNoKCk7CitXVEZfRVhQT1JUX1BSSVZBVEUgTk9fUkVUVVJOX0RVRV9UT19DUkFTSCB2 b2lkIFdURkNyYXNoSW1wbCgpOwogI2VuZGlmCiAKLSNpZmRlZiBfX2NwbHVzcGx1cwotfQotI2Vu ZGlmCitXVEZfRVhQT1JUX1BSSVZBVEUgTk9fUkVUVVJOX0RVRV9UT19DUkFTSCB2b2lkIFdURkNy YXNoKCk7CiAKICNpZm5kZWYgQ1JBU0hfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTgogI2RlZmlu ZSBDUkFTSF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCkgV1RGQ3Jhc2hXaXRoU2VjdXJpdHlJ bXBsaWNhdGlvbigpCiAjZW5kaWYKIAotI2lmZGVmIF9fY3BsdXNwbHVzCi1leHRlcm4gIkMiIHsK LSNlbmRpZgotICAgIFdURl9FWFBPUlRfUFJJVkFURSBOT19SRVRVUk5fRFVFX1RPX0NSQVNIIHZv aWQgV1RGQ3Jhc2hXaXRoU2VjdXJpdHlJbXBsaWNhdGlvbigpOworV1RGX0VYUE9SVF9QUklWQVRF IE5PX1JFVFVSTl9EVUVfVE9fQ1JBU0ggdm9pZCBXVEZDcmFzaFdpdGhTZWN1cml0eUltcGxpY2F0 aW9uKCk7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCg==