184360 2018-04-06 10:31:11 -0700 Have class Exception take String by value instead of a String&& 2018-04-06 14:23:15 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=184345 InRadar P2 Normal --- 1 dbates dbates cdumez darin ews-watchlist ryanhaddad webkit-bug-importer youennf oldest_to_newest 1412396 0 dbates 2018-04-06 10:31:11 -0700 The requirement of class Exception to take its optional message argument as String&& instead of String came up in bug 184345, comment 13. This requirement means that a caller must explicitly invoke the String constructor on a lvalue String object in order to instantiate an Exception. We should support instantiating an Exception with either an lvalue or rvalue String for convenience. Although it can be argued that having Exception take a String by value instead of String&& can lead to missed opportunities to WTFMove() a String object into Exception such mistakes are just that, missed opportunities. That is, correctness is not affected and we may perform an unnecessary ref/deref of the underlying StringImpl when instantiating an Exception. If such missed opportunities show up in profiles and such mistakes happen often then we can re-evaluate the decision to have Exception take a String by value. 1412397 1 337374 dbates 2018-04-06 10:34:34 -0700 Created attachment 337374 Patch 1412398 2 337375 dbates 2018-04-06 10:37:39 -0700 Created attachment 337375 Patch 1412400 3 ews-watchlist 2018-04-06 10:39:34 -0700 Attachment 337375 did not pass style-queue: ERROR: Source/WebCore/dom/Exception.h:56: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1412403 4 337375 dbates 2018-04-06 10:46:02 -0700 Comment on attachment 337375 Patch Clearing flags on attachment: 337375 Committed r230338: <https://trac.webkit.org/changeset/230338> 1412404 5 dbates 2018-04-06 10:46:04 -0700 All reviewed patches have been landed. Closing bug. 1412405 6 webkit-bug-importer 2018-04-06 10:47:33 -0700 <rdar://problem/39242507> 1412411 7 ryanhaddad 2018-04-06 11:11:10 -0700 This change broke builds https://build.webkit.org/builders/Apple%20Sierra%20Release%20%28Build%29/builds/9820 1412430 8 337375 cdumez 2018-04-06 12:19:27 -0700 Comment on attachment 337375 Patch This is pretty recent code from Darin so I added him in cc. I personally prefer String&& it forces people to write efficient code. 1412475 9 darin 2018-04-06 14:11:57 -0700 I don’t feel strongly about this either way. I chose String&& for roughly the same reason as Chris: since this was a brand new class I figured I would bias towards the more efficient move semantic. 1412480 10 darin 2018-04-06 14:23:15 -0700 Some more thoughts on this. (In reply to Daniel Bates from comment #0) > That is, correctness is not affected and we may perform an unnecessary > ref/deref of the underlying StringImpl when instantiating an Exception. If > such missed opportunities show up in profiles and such mistakes happen often > then we can re-evaluate the decision to have Exception take a String by > value. Since String is simply an object that wraps a RefPtr, to think this through we need to basically make an argument about all functions that take ownership of a ref to a pointed-to object. If the type involved is T, which of these should the function take (ignoring nullability, which brings in three more types)? T* RefPtr<T> RefPtr<T>&& A downside of T* is that there is no way to optimize the transfer of ownership. So it leads to maximum reference count churn. But it’s the most flexible in terms of "the easiest type to pass"; always just a get() or a ptr() away. A downside of RefPtr<T> is that extra reference count churn is relatively common; any time a RefPtr from a local variable is used and someone forgets to use WTFMove, it will occur. A downside of RefPtr<T>&& is that callers have to write out type casts when they want to share rather than moving. It is this downside that caused Dan to propose this change. But these cases should be really rare. For String, it’s basically only when we are dealing with functions that return const String& or when we want to have an implicit conversion to String. I don’t want to do something different for String than we would for RefPtr<StringImpl>. In fact, I dream about some day making the RefPtr aspect of String more explicit for callers and making it more straightforward to use StringImpl* and StringImpl& as appropriate. Some day maybe StringImpl can be renamed to String. 337374 2018-04-06 10:34:34 -0700 2018-04-06 10:37:38 -0700 Patch bug-184360-20180406103433.patch text/plain 6723 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDE0MzczZjQyNTU5YjYy YjYyZDQzMzA3NWYzMzU2OTY5NTBkMWQyMy4uN2FkNGUzMDU2YTA3YjM4N2Q2NDlmZDgwMWZkYzVl YTg4MjcwNTBkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE4LTA0LTA2ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBIYXZlIGNsYXNzIEV4Y2Vw dGlvbiB0YWtlIFN0cmluZyBieSB2YWx1ZSBpbnN0ZWFkIG9mIGEgU3RyaW5nJiYKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NDM2MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvciBjb252ZW5pZW5jZSBz dXBwb3J0IGluc3RhbnRpYXRpbmcgYW4gRXhjZXB0aW9uIHdpdGggZWl0aGVyIGFuIGx2YWx1ZSBT dHJpbmcgb3IKKyAgICAgICAgcnZhbHVlIFN0cmluZy4KKworICAgICAgICBBbHRob3VnaCBpdCBj YW4gYmUgYXJndWVkIHRoYXQgaGF2aW5nIEV4Y2VwdGlvbiB0YWtlIGEgU3RyaW5nIGJ5IHZhbHVl IGluc3RlYWQgb2YgU3RyaW5nJiYKKyAgICAgICAgY2FuIGxlYWQgdG8gbWlzc2VkIG9wcG9ydHVu aXRpZXMgdG8gV1RGTW92ZSgpIGEgU3RyaW5nIG9iamVjdCBpbnRvIEV4Y2VwdGlvbiBzdWNoIG1p c3Rha2VzCisgICAgICAgIGFyZSBqdXN0IHRoYXQsIG1pc3NlZCBvcHBvcnR1bml0aWVzLiBUaGF0 IGlzLCBjb3JyZWN0bmVzcyBpcyBub3QgYWZmZWN0ZWQgYW5kIHdlIG1heSBwZXJmb3JtCisgICAg ICAgIGFuIHVubmVjZXNzYXJ5IHJlZi9kZXJlZiBvZiB0aGUgdW5kZXJseWluZyBTdHJpbmdJbXBs IHdoZW4gaW5zdGFudGlhdGluZyBhbiBFeGNlcHRpb24uIElmCisgICAgICAgIHN1Y2ggbWlzc2Vk IG9wcG9ydHVuaXRpZXMgc2hvdyB1cCBpbiBwcm9maWxlcyBhbmQgc3VjaCBtaXN0YWtlcyBoYXBw ZW4gb2Z0ZW4gdGhlbiB3ZSBjYW4KKyAgICAgICAgcmUtZXZhbHVhdGUgdGhlIGRlY2lzaW9uIHRv IGhhdmUgRXhjZXB0aW9uIHRha2UgYSBTdHJpbmcgYnkgdmFsdWUuCisKKyAgICAgICAgKiBNb2R1 bGVzL2NhY2hlL0RPTUNhY2hlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRPTUNhY2hlOjpwdXQp OiBTaW1wbGlmeSBjb2RlIG5vdyB0aGF0IEV4Y2VwdGlvbiB0YWtlcyBhIFN0cmluZyBieSB2YWx1 ZS4KKyAgICAgICAgKiBNb2R1bGVzL2ZldGNoL0ZldGNoUmVzcG9uc2UuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RmV0Y2hSZXNwb25zZTo6Qm9keUxvYWRlcjo6ZGlkRmFpbCk6IERpdHRvLgorICAg ICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9p bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDTWVkaWFFbmRwb2ludDo6Y3JlYXRl U2Vzc2lvbkRlc2NyaXB0aW9uRmFpbGVkKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpMaWJX ZWJSVENNZWRpYUVuZHBvaW50OjpzZXRMb2NhbFNlc3Npb25EZXNjcmlwdGlvbkZhaWxlZCk6IERp dHRvLgorICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDTWVkaWFFbmRwb2ludDo6c2V0UmVtb3Rl U2Vzc2lvbkRlc2NyaXB0aW9uRmFpbGVkKTogRGl0dG8uCisgICAgICAgICogZG9tL0V4Y2VwdGlv bi5oOgorICAgICAgICAoV2ViQ29yZTo6RXhjZXB0aW9uOjpFeGNlcHRpb24pOiBUYWtlIFN0cmlu ZyBieSB2YWx1ZS4gQWxzbyB1c2UgdW5pZm9ybSBpbml0aWFsaXplciBzeW50YXguCisKIDIwMTgt MDQtMDUgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIEVtaXQg YSBtb3JlIGluZm9ybWF0aXZlIG1lc3NhZ2Ugd2hlbiBhIHNjcmlwdCBpcyBibG9ja2VkIGR1ZSB0 byAiWC1Db250ZW50LVR5cGU6IG5vc25pZmYiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2NhY2hlL0RPTUNhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvY2FjaGUv RE9NQ2FjaGUuY3BwCmluZGV4IDQ1YzVlZTYxNTg4OGU1ODgzZjZjN2FjODZlYWE0NTdkYzc2ZTcz ZDkuLjk4ZDYyYWRkMWMzZWQ2MTY2Y2Y3NTEwOGJhZDA4YzAyN2IyMDU1NjQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvY2FjaGUvRE9NQ2FjaGUuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvY2FjaGUvRE9NQ2FjaGUuY3BwCkBAIC0zMjEsNyArMzIxLDcgQEAgdm9p ZCBET01DYWNoZTo6cHV0KFJlcXVlc3RJbmZvJiYgaW5mbywgUmVmPEZldGNoUmVzcG9uc2U+JiYg cmVzcG9uc2UsIERPTVByb21pc2UKICAgICBhdXRvIHJlcXVlc3QgPSByZXF1ZXN0T3JFeGNlcHRp b24ucmVsZWFzZVJldHVyblZhbHVlKCk7CiAKICAgICBpZiAocmVzcG9uc2UtPmxvYWRpbmdFcnJv cigpKSB7Ci0gICAgICAgIHByb21pc2UucmVqZWN0KEV4Y2VwdGlvbiB7IFR5cGVFcnJvciwgU3Ry aW5nIHsgcmVzcG9uc2UtPmxvYWRpbmdFcnJvcigpLT5sb2NhbGl6ZWREZXNjcmlwdGlvbigpIH0g fSk7CisgICAgICAgIHByb21pc2UucmVqZWN0KEV4Y2VwdGlvbiB7IFR5cGVFcnJvciwgcmVzcG9u c2UtPmxvYWRpbmdFcnJvcigpLT5sb2NhbGl6ZWREZXNjcmlwdGlvbigpIH0pOwogICAgICAgICBy ZXR1cm47CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNo L0ZldGNoUmVzcG9uc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaFJl c3BvbnNlLmNwcAppbmRleCA3ZGU1OGRhYmFlNDAyMGVhZjA1YzA1YTMyZWU3OTJlMTdjYjY3YmQw Li5kOTZjN2JiODY5NmI2MDBkN2QxNWZiNTQzYzI1ZDg4YjExM2NlNTMwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0ZldGNoUmVzcG9uc2UuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvZmV0Y2gvRmV0Y2hSZXNwb25zZS5jcHAKQEAgLTI0MSwxMCArMjQx LDEwIEBAIHZvaWQgRmV0Y2hSZXNwb25zZTo6Qm9keUxvYWRlcjo6ZGlkRmFpbChjb25zdCBSZXNv dXJjZUVycm9yJiBlcnJvcikKICAgICBtX3Jlc3BvbnNlLm1fbG9hZGluZ0Vycm9yID0gZXJyb3I7 CiAKICAgICBpZiAoYXV0byByZXNwb25zZUNhbGxiYWNrID0gV1RGTW92ZShtX3Jlc3BvbnNlQ2Fs bGJhY2spKQotICAgICAgICByZXNwb25zZUNhbGxiYWNrKEV4Y2VwdGlvbiB7IFR5cGVFcnJvciwg U3RyaW5nKGVycm9yLmxvY2FsaXplZERlc2NyaXB0aW9uKCkpIH0pOworICAgICAgICByZXNwb25z ZUNhbGxiYWNrKEV4Y2VwdGlvbiB7IFR5cGVFcnJvciwgZXJyb3IubG9jYWxpemVkRGVzY3JpcHRp b24oKSB9KTsKIAogICAgIGlmIChhdXRvIGNvbnN1bWVEYXRhQ2FsbGJhY2sgPSBXVEZNb3ZlKG1f Y29uc3VtZURhdGFDYWxsYmFjaykpCi0gICAgICAgIGNvbnN1bWVEYXRhQ2FsbGJhY2soRXhjZXB0 aW9uIHsgVHlwZUVycm9yLCBTdHJpbmcoZXJyb3IubG9jYWxpemVkRGVzY3JpcHRpb24oKSkgfSk7 CisgICAgICAgIGNvbnN1bWVEYXRhQ2FsbGJhY2soRXhjZXB0aW9uIHsgVHlwZUVycm9yLCBlcnJv ci5sb2NhbGl6ZWREZXNjcmlwdGlvbigpIH0pOwogCiAjaWYgRU5BQkxFKFNUUkVBTVNfQVBJKQog ICAgIGlmIChtX3Jlc3BvbnNlLm1fcmVhZGFibGVTdHJlYW1Tb3VyY2UpIHsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01l ZGlhRW5kcG9pbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3 ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5jcHAKaW5kZXggOWY2NDVlZDk3YWYwZWNlMGMz MmFjN2Y5ZTQ5NTU3ZmUxNjg1YzZiOC4uYjAxNTc4OWM0ODYyMmZmNjlmMDU5NzljNDlkNzk3NzIx YTY2ZGRkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9s aWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5jcHAK QEAgLTkxNCw5ICs5MTQsOSBAQCB2b2lkIExpYldlYlJUQ01lZGlhRW5kcG9pbnQ6OmNyZWF0ZVNl c3Npb25EZXNjcmlwdGlvbkZhaWxlZChjb25zdCBzdGQ6OnN0cmluZyYgZQogICAgICAgICBpZiAo cHJvdGVjdGVkVGhpcy0+aXNTdG9wcGVkKCkpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IGlmIChwcm90ZWN0ZWRUaGlzLT5tX2lzSW5pdGlhdG9yKQotICAgICAgICAgICAgcHJvdGVjdGVk VGhpcy0+bV9wZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3JlYXRlT2ZmZXJGYWlsZWQoRXhjZXB0aW9u IHsgT3BlcmF0aW9uRXJyb3IsIFN0cmluZyhlcnJvcikgfSk7CisgICAgICAgICAgICBwcm90ZWN0 ZWRUaGlzLT5tX3BlZXJDb25uZWN0aW9uQmFja2VuZC5jcmVhdGVPZmZlckZhaWxlZChFeGNlcHRp b24geyBPcGVyYXRpb25FcnJvciwgV1RGTW92ZShlcnJvcikgfSk7CiAgICAgICAgIGVsc2UKLSAg ICAgICAgICAgIHByb3RlY3RlZFRoaXMtPm1fcGVlckNvbm5lY3Rpb25CYWNrZW5kLmNyZWF0ZUFu c3dlckZhaWxlZChFeGNlcHRpb24geyBPcGVyYXRpb25FcnJvciwgU3RyaW5nKGVycm9yKSB9KTsK KyAgICAgICAgICAgIHByb3RlY3RlZFRoaXMtPm1fcGVlckNvbm5lY3Rpb25CYWNrZW5kLmNyZWF0 ZUFuc3dlckZhaWxlZChFeGNlcHRpb24geyBPcGVyYXRpb25FcnJvciwgV1RGTW92ZShlcnJvcikg fSk7CiAgICAgfSk7CiB9CiAKQEAgLTkzNSw3ICs5MzUsNyBAQCB2b2lkIExpYldlYlJUQ01lZGlh RW5kcG9pbnQ6OnNldExvY2FsU2Vzc2lvbkRlc2NyaXB0aW9uRmFpbGVkKGNvbnN0IHN0ZDo6c3Ry aW5nJgogICAgIGNhbGxPbk1haW5UaHJlYWQoW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlz KSwgZXJyb3IgPSBXVEZNb3ZlKGVycm9yKV0gewogICAgICAgICBpZiAocHJvdGVjdGVkVGhpcy0+ aXNTdG9wcGVkKCkpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHByb3RlY3RlZFRoaXMt Pm1fcGVlckNvbm5lY3Rpb25CYWNrZW5kLnNldExvY2FsRGVzY3JpcHRpb25GYWlsZWQoRXhjZXB0 aW9uIHsgT3BlcmF0aW9uRXJyb3IsIFN0cmluZyhlcnJvcikgfSk7CisgICAgICAgIHByb3RlY3Rl ZFRoaXMtPm1fcGVlckNvbm5lY3Rpb25CYWNrZW5kLnNldExvY2FsRGVzY3JpcHRpb25GYWlsZWQo RXhjZXB0aW9uIHsgT3BlcmF0aW9uRXJyb3IsIFdURk1vdmUoZXJyb3IpIH0pOwogICAgIH0pOwog fQogCkBAIC05NTQsNyArOTU0LDcgQEAgdm9pZCBMaWJXZWJSVENNZWRpYUVuZHBvaW50OjpzZXRS ZW1vdGVTZXNzaW9uRGVzY3JpcHRpb25GYWlsZWQoY29uc3Qgc3RkOjpzdHJpbmcKICAgICBjYWxs T25NYWluVGhyZWFkKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGVycm9yID0gV1RG TW92ZShlcnJvcildIHsKICAgICAgICAgaWYgKHByb3RlY3RlZFRoaXMtPmlzU3RvcHBlZCgpKQog ICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBwcm90ZWN0ZWRUaGlzLT5tX3BlZXJDb25uZWN0 aW9uQmFja2VuZC5zZXRSZW1vdGVEZXNjcmlwdGlvbkZhaWxlZChFeGNlcHRpb24geyBPcGVyYXRp b25FcnJvciwgU3RyaW5nKGVycm9yKSB9KTsKKyAgICAgICAgcHJvdGVjdGVkVGhpcy0+bV9wZWVy Q29ubmVjdGlvbkJhY2tlbmQuc2V0UmVtb3RlRGVzY3JpcHRpb25GYWlsZWQoRXhjZXB0aW9uIHsg T3BlcmF0aW9uRXJyb3IsIFdURk1vdmUoZXJyb3IpIH0pOwogICAgIH0pOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRXhjZXB0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20v RXhjZXB0aW9uLmgKaW5kZXggMDk3YjkxNzVmNWQ1YzhkMmQ3NDU4NjliNmRjYjUyMGRkYzcxMWZj Ni4uZTFlN2FkYjk4NmNhYWQ2NzIxNTliMWUzYzI4MGE4OWQ3YWMxNzkwZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZG9tL0V4Y2VwdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9F eGNlcHRpb24uaApAQCAtMzMsNyArMzMsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNz IEV4Y2VwdGlvbiB7CiBwdWJsaWM6Ci0gICAgZXhwbGljaXQgRXhjZXB0aW9uKEV4Y2VwdGlvbkNv ZGUsIFN0cmluZyYmID0geyB9KTsKKyAgICBleHBsaWNpdCBFeGNlcHRpb24oRXhjZXB0aW9uQ29k ZSwgU3RyaW5nID0geyB9KTsKIAogICAgIEV4Y2VwdGlvbkNvZGUgY29kZSgpIGNvbnN0IHsgcmV0 dXJuIG1fY29kZTsgfQogICAgIGNvbnN0IFN0cmluZyYgbWVzc2FnZSgpIGNvbnN0IHsgcmV0dXJu IG1fbWVzc2FnZTsgfQpAQCAtNTEsOSArNTEsOSBAQCBwcml2YXRlOgogCiBFeGNlcHRpb24gaXNv bGF0ZWRDb3B5KEV4Y2VwdGlvbiYmKTsKIAotaW5saW5lIEV4Y2VwdGlvbjo6RXhjZXB0aW9uKEV4 Y2VwdGlvbkNvZGUgY29kZSwgU3RyaW5nJiYgbWVzc2FnZSkKLSAgICA6IG1fY29kZShjb2RlKQot ICAgICwgbV9tZXNzYWdlKFdURk1vdmUobWVzc2FnZSkpCitpbmxpbmUgRXhjZXB0aW9uOjpFeGNl cHRpb24oRXhjZXB0aW9uQ29kZSBjb2RlLCBTdHJpbmcgbWVzc2FnZSkKKyAgICA6IG1fY29kZSB7 IGNvZGUgfQorICAgICwgbV9tZXNzYWdlIHsgV1RGTW92ZShtZXNzYWdlKSB9CiB7CiB9CiAK 337375 2018-04-06 10:37:39 -0700 2018-04-06 10:46:02 -0700 Patch bug-184360-20180406103738.patch text/plain 6788 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDE0MzczZjQyNTU5YjYy YjYyZDQzMzA3NWYzMzU2OTY5NTBkMWQyMy4uZDM1NjAyOWZmMDRiNmQyY2M4OWI4NTczMTE0N2Zm YzFiYjZhOTdiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE4LTA0LTA2ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBIYXZlIGNsYXNzIEV4Y2Vw dGlvbiB0YWtlIFN0cmluZyBieSB2YWx1ZSBpbnN0ZWFkIG9mIGEgU3RyaW5nJiYKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NDM2MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvciBjb252ZW5pZW5jZSBz dXBwb3J0IGluc3RhbnRpYXRpbmcgYW4gRXhjZXB0aW9uIHdpdGggZWl0aGVyIGFuIGx2YWx1ZSBT dHJpbmcgb3IKKyAgICAgICAgcnZhbHVlIFN0cmluZy4KKworICAgICAgICBBbHRob3VnaCBpdCBj YW4gYmUgYXJndWVkIHRoYXQgaGF2aW5nIEV4Y2VwdGlvbiB0YWtlIGEgU3RyaW5nIGJ5IHZhbHVl IGluc3RlYWQgb2YgU3RyaW5nJiYKKyAgICAgICAgY2FuIGxlYWQgdG8gbWlzc2VkIG9wcG9ydHVu aXRpZXMgdG8gV1RGTW92ZSgpIGEgU3RyaW5nIG9iamVjdCBpbnRvIEV4Y2VwdGlvbiBzdWNoIG1p c3Rha2VzCisgICAgICAgIGFyZSBqdXN0IHRoYXQsIG1pc3NlZCBvcHBvcnR1bml0aWVzLiBUaGF0 IGlzLCBjb3JyZWN0bmVzcyBpcyBub3QgYWZmZWN0ZWQgYW5kIHdlIG1heSBwZXJmb3JtCisgICAg ICAgIGFuIHVubmVjZXNzYXJ5IHJlZi9kZXJlZiBvZiB0aGUgdW5kZXJseWluZyBTdHJpbmdJbXBs IHdoZW4gaW5zdGFudGlhdGluZyBhbiBFeGNlcHRpb24uIElmCisgICAgICAgIHN1Y2ggbWlzc2Vk IG9wcG9ydHVuaXRpZXMgc2hvdyB1cCBpbiBwcm9maWxlcyBhbmQgc3VjaCBtaXN0YWtlcyBoYXBw ZW4gb2Z0ZW4gdGhlbiB3ZSBjYW4KKyAgICAgICAgcmUtZXZhbHVhdGUgdGhlIGRlY2lzaW9uIHRv IGhhdmUgRXhjZXB0aW9uIHRha2UgYSBTdHJpbmcgYnkgdmFsdWUuCisKKyAgICAgICAgKiBNb2R1 bGVzL2NhY2hlL0RPTUNhY2hlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRPTUNhY2hlOjpwdXQp OiBTaW1wbGlmeSBjb2RlIG5vdyB0aGF0IEV4Y2VwdGlvbiB0YWtlcyBhIFN0cmluZyBieSB2YWx1 ZS4KKyAgICAgICAgKiBNb2R1bGVzL2ZldGNoL0ZldGNoUmVzcG9uc2UuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RmV0Y2hSZXNwb25zZTo6Qm9keUxvYWRlcjo6ZGlkRmFpbCk6IERpdHRvLgorICAg ICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9p bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDTWVkaWFFbmRwb2ludDo6Y3JlYXRl U2Vzc2lvbkRlc2NyaXB0aW9uRmFpbGVkKTogTW92ZSBTdHJpbmcgaW50byBFeGNlcHRpb24gdG8g YXZvaWQgYW4KKyAgICAgICAgdW5uZWNlc3NhcnkgcmVmL2RlLXJlZi4KKyAgICAgICAgKFdlYkNv cmU6OkxpYldlYlJUQ01lZGlhRW5kcG9pbnQ6OnNldExvY2FsU2Vzc2lvbkRlc2NyaXB0aW9uRmFp bGVkKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpMaWJXZWJSVENNZWRpYUVuZHBvaW50Ojpz ZXRSZW1vdGVTZXNzaW9uRGVzY3JpcHRpb25GYWlsZWQpOiBEaXR0by4KKyAgICAgICAgKiBkb20v RXhjZXB0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpFeGNlcHRpb246OkV4Y2VwdGlvbik6IFRh a2UgU3RyaW5nIGJ5IHZhbHVlLiBBbHNvIHVzZSB1bmlmb3JtIGluaXRpYWxpemVyIHN5bnRheC4K KwogMjAxOC0wNC0wNSAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAg ICAgRW1pdCBhIG1vcmUgaW5mb3JtYXRpdmUgbWVzc2FnZSB3aGVuIGEgc2NyaXB0IGlzIGJsb2Nr ZWQgZHVlIHRvICJYLUNvbnRlbnQtVHlwZTogbm9zbmlmZiIKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvY2FjaGUvRE9NQ2FjaGUuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9jYWNoZS9ET01DYWNoZS5jcHAKaW5kZXggNDVjNWVlNjE1ODg4ZTU4ODNmNmM3YWM4NmVhYTQ1 N2RjNzZlNzNkOS4uOThkNjJhZGQxYzNlZDYxNjZjZjc1MTA4YmFkMDhjMDI3YjIwNTU2NCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9ET01DYWNoZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9jYWNoZS9ET01DYWNoZS5jcHAKQEAgLTMyMSw3ICszMjEs NyBAQCB2b2lkIERPTUNhY2hlOjpwdXQoUmVxdWVzdEluZm8mJiBpbmZvLCBSZWY8RmV0Y2hSZXNw b25zZT4mJiByZXNwb25zZSwgRE9NUHJvbWlzZQogICAgIGF1dG8gcmVxdWVzdCA9IHJlcXVlc3RP ckV4Y2VwdGlvbi5yZWxlYXNlUmV0dXJuVmFsdWUoKTsKIAogICAgIGlmIChyZXNwb25zZS0+bG9h ZGluZ0Vycm9yKCkpIHsKLSAgICAgICAgcHJvbWlzZS5yZWplY3QoRXhjZXB0aW9uIHsgVHlwZUVy cm9yLCBTdHJpbmcgeyByZXNwb25zZS0+bG9hZGluZ0Vycm9yKCktPmxvY2FsaXplZERlc2NyaXB0 aW9uKCkgfSB9KTsKKyAgICAgICAgcHJvbWlzZS5yZWplY3QoRXhjZXB0aW9uIHsgVHlwZUVycm9y LCByZXNwb25zZS0+bG9hZGluZ0Vycm9yKCktPmxvY2FsaXplZERlc2NyaXB0aW9uKCkgfSk7CiAg ICAgICAgIHJldHVybjsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvZmV0Y2gvRmV0Y2hSZXNwb25zZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNo L0ZldGNoUmVzcG9uc2UuY3BwCmluZGV4IDdkZTU4ZGFiYWU0MDIwZWFmMDVjMDVhMzJlZTc5MmUx N2NiNjdiZDAuLmQ5NmM3YmI4Njk2YjYwMGQ3ZDE1ZmI1NDNjMjVkODhiMTEzY2U1MzAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmV0Y2gvRmV0Y2hSZXNwb25zZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaFJlc3BvbnNlLmNwcApAQCAtMjQx LDEwICsyNDEsMTAgQEAgdm9pZCBGZXRjaFJlc3BvbnNlOjpCb2R5TG9hZGVyOjpkaWRGYWlsKGNv bnN0IFJlc291cmNlRXJyb3ImIGVycm9yKQogICAgIG1fcmVzcG9uc2UubV9sb2FkaW5nRXJyb3Ig PSBlcnJvcjsKIAogICAgIGlmIChhdXRvIHJlc3BvbnNlQ2FsbGJhY2sgPSBXVEZNb3ZlKG1fcmVz cG9uc2VDYWxsYmFjaykpCi0gICAgICAgIHJlc3BvbnNlQ2FsbGJhY2soRXhjZXB0aW9uIHsgVHlw ZUVycm9yLCBTdHJpbmcoZXJyb3IubG9jYWxpemVkRGVzY3JpcHRpb24oKSkgfSk7CisgICAgICAg IHJlc3BvbnNlQ2FsbGJhY2soRXhjZXB0aW9uIHsgVHlwZUVycm9yLCBlcnJvci5sb2NhbGl6ZWRE ZXNjcmlwdGlvbigpIH0pOwogCiAgICAgaWYgKGF1dG8gY29uc3VtZURhdGFDYWxsYmFjayA9IFdU Rk1vdmUobV9jb25zdW1lRGF0YUNhbGxiYWNrKSkKLSAgICAgICAgY29uc3VtZURhdGFDYWxsYmFj ayhFeGNlcHRpb24geyBUeXBlRXJyb3IsIFN0cmluZyhlcnJvci5sb2NhbGl6ZWREZXNjcmlwdGlv bigpKSB9KTsKKyAgICAgICAgY29uc3VtZURhdGFDYWxsYmFjayhFeGNlcHRpb24geyBUeXBlRXJy b3IsIGVycm9yLmxvY2FsaXplZERlc2NyaXB0aW9uKCkgfSk7CiAKICNpZiBFTkFCTEUoU1RSRUFN U19BUEkpCiAgICAgaWYgKG1fcmVzcG9uc2UubV9yZWFkYWJsZVN0cmVhbVNvdXJjZSkgewpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGli V2ViUlRDTWVkaWFFbmRwb2ludC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcAppbmRleCA5ZjY0NWVkOTdh ZjBlY2UwYzMyYWM3ZjllNDk1NTdmZTE2ODVjNmI4Li5iMDE1Nzg5YzQ4NjIyZmY2OWYwNTk3OWM0 OWQ3OTc3MjFhNjZkZGQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh c3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBv aW50LmNwcApAQCAtOTE0LDkgKzkxNCw5IEBAIHZvaWQgTGliV2ViUlRDTWVkaWFFbmRwb2ludDo6 Y3JlYXRlU2Vzc2lvbkRlc2NyaXB0aW9uRmFpbGVkKGNvbnN0IHN0ZDo6c3RyaW5nJiBlCiAgICAg ICAgIGlmIChwcm90ZWN0ZWRUaGlzLT5pc1N0b3BwZWQoKSkKICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgaWYgKHByb3RlY3RlZFRoaXMtPm1faXNJbml0aWF0b3IpCi0gICAgICAgICAgICBw cm90ZWN0ZWRUaGlzLT5tX3BlZXJDb25uZWN0aW9uQmFja2VuZC5jcmVhdGVPZmZlckZhaWxlZChF eGNlcHRpb24geyBPcGVyYXRpb25FcnJvciwgU3RyaW5nKGVycm9yKSB9KTsKKyAgICAgICAgICAg IHByb3RlY3RlZFRoaXMtPm1fcGVlckNvbm5lY3Rpb25CYWNrZW5kLmNyZWF0ZU9mZmVyRmFpbGVk KEV4Y2VwdGlvbiB7IE9wZXJhdGlvbkVycm9yLCBXVEZNb3ZlKGVycm9yKSB9KTsKICAgICAgICAg ZWxzZQotICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+bV9wZWVyQ29ubmVjdGlvbkJhY2tlbmQu Y3JlYXRlQW5zd2VyRmFpbGVkKEV4Y2VwdGlvbiB7IE9wZXJhdGlvbkVycm9yLCBTdHJpbmcoZXJy b3IpIH0pOworICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+bV9wZWVyQ29ubmVjdGlvbkJhY2tl bmQuY3JlYXRlQW5zd2VyRmFpbGVkKEV4Y2VwdGlvbiB7IE9wZXJhdGlvbkVycm9yLCBXVEZNb3Zl KGVycm9yKSB9KTsKICAgICB9KTsKIH0KIApAQCAtOTM1LDcgKzkzNSw3IEBAIHZvaWQgTGliV2Vi UlRDTWVkaWFFbmRwb2ludDo6c2V0TG9jYWxTZXNzaW9uRGVzY3JpcHRpb25GYWlsZWQoY29uc3Qg c3RkOjpzdHJpbmcmCiAgICAgY2FsbE9uTWFpblRocmVhZChbcHJvdGVjdGVkVGhpcyA9IG1ha2VS ZWYoKnRoaXMpLCBlcnJvciA9IFdURk1vdmUoZXJyb3IpXSB7CiAgICAgICAgIGlmIChwcm90ZWN0 ZWRUaGlzLT5pc1N0b3BwZWQoKSkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgcHJvdGVj dGVkVGhpcy0+bV9wZWVyQ29ubmVjdGlvbkJhY2tlbmQuc2V0TG9jYWxEZXNjcmlwdGlvbkZhaWxl ZChFeGNlcHRpb24geyBPcGVyYXRpb25FcnJvciwgU3RyaW5nKGVycm9yKSB9KTsKKyAgICAgICAg cHJvdGVjdGVkVGhpcy0+bV9wZWVyQ29ubmVjdGlvbkJhY2tlbmQuc2V0TG9jYWxEZXNjcmlwdGlv bkZhaWxlZChFeGNlcHRpb24geyBPcGVyYXRpb25FcnJvciwgV1RGTW92ZShlcnJvcikgfSk7CiAg ICAgfSk7CiB9CiAKQEAgLTk1NCw3ICs5NTQsNyBAQCB2b2lkIExpYldlYlJUQ01lZGlhRW5kcG9p bnQ6OnNldFJlbW90ZVNlc3Npb25EZXNjcmlwdGlvbkZhaWxlZChjb25zdCBzdGQ6OnN0cmluZwog ICAgIGNhbGxPbk1haW5UaHJlYWQoW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZXJy b3IgPSBXVEZNb3ZlKGVycm9yKV0gewogICAgICAgICBpZiAocHJvdGVjdGVkVGhpcy0+aXNTdG9w cGVkKCkpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHByb3RlY3RlZFRoaXMtPm1fcGVl ckNvbm5lY3Rpb25CYWNrZW5kLnNldFJlbW90ZURlc2NyaXB0aW9uRmFpbGVkKEV4Y2VwdGlvbiB7 IE9wZXJhdGlvbkVycm9yLCBTdHJpbmcoZXJyb3IpIH0pOworICAgICAgICBwcm90ZWN0ZWRUaGlz LT5tX3BlZXJDb25uZWN0aW9uQmFja2VuZC5zZXRSZW1vdGVEZXNjcmlwdGlvbkZhaWxlZChFeGNl cHRpb24geyBPcGVyYXRpb25FcnJvciwgV1RGTW92ZShlcnJvcikgfSk7CiAgICAgfSk7CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FeGNlcHRpb24uaCBiL1NvdXJjZS9XZWJD b3JlL2RvbS9FeGNlcHRpb24uaAppbmRleCAwOTdiOTE3NWY1ZDVjOGQyZDc0NTg2OWI2ZGNiNTIw ZGRjNzExZmM2Li5lMWU3YWRiOTg2Y2FhZDY3MjE1OWIxZTNjMjgwYTg5ZDdhYzE3OTBmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRXhjZXB0aW9uLmgKKysrIGIvU291cmNlL1dlYkNv cmUvZG9tL0V4Y2VwdGlvbi5oCkBAIC0zMyw3ICszMyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogY2xhc3MgRXhjZXB0aW9uIHsKIHB1YmxpYzoKLSAgICBleHBsaWNpdCBFeGNlcHRpb24oRXhj ZXB0aW9uQ29kZSwgU3RyaW5nJiYgPSB7IH0pOworICAgIGV4cGxpY2l0IEV4Y2VwdGlvbihFeGNl cHRpb25Db2RlLCBTdHJpbmcgPSB7IH0pOwogCiAgICAgRXhjZXB0aW9uQ29kZSBjb2RlKCkgY29u c3QgeyByZXR1cm4gbV9jb2RlOyB9CiAgICAgY29uc3QgU3RyaW5nJiBtZXNzYWdlKCkgY29uc3Qg eyByZXR1cm4gbV9tZXNzYWdlOyB9CkBAIC01MSw5ICs1MSw5IEBAIHByaXZhdGU6CiAKIEV4Y2Vw dGlvbiBpc29sYXRlZENvcHkoRXhjZXB0aW9uJiYpOwogCi1pbmxpbmUgRXhjZXB0aW9uOjpFeGNl cHRpb24oRXhjZXB0aW9uQ29kZSBjb2RlLCBTdHJpbmcmJiBtZXNzYWdlKQotICAgIDogbV9jb2Rl KGNvZGUpCi0gICAgLCBtX21lc3NhZ2UoV1RGTW92ZShtZXNzYWdlKSkKK2lubGluZSBFeGNlcHRp b246OkV4Y2VwdGlvbihFeGNlcHRpb25Db2RlIGNvZGUsIFN0cmluZyBtZXNzYWdlKQorICAgIDog bV9jb2RlIHsgY29kZSB9CisgICAgLCBtX21lc3NhZ2UgeyBXVEZNb3ZlKG1lc3NhZ2UpIH0KIHsK IH0KIAo=