136599 2014-09-06 04:52:52 -0700 New clang warns about boolean checks for |this| pointer in RenderObject debug methods 2015-09-03 16:23:56 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ddkilzer ddkilzer commit-queue darin esprehn+autocc glenn hyatt kondapallykalyan krit simon.fraser zalan oldest_to_newest 1033653 0 ddkilzer 2014-09-06 04:52:52 -0700 New builds of clang warn about boolean checks for the |this| pointer being undefined behavior: Source/WebCore/rendering/RenderObject.cpp:1465:10: error: 'this' pointer cannot be null in wel l-defined C++ code; pointer may be assumed to always convert to true [-Werror,-Wundefined-bool-conversion] if (!this) { ~^~~~ Source/WebCore/rendering/RenderObject.cpp:1584:10: error: 'this' pointer cannot be null in wel l-defined C++ code; pointer may be assumed to always convert to true [-Werror,-Wundefined-bool-conversion] if (!this) ~^~~~ 2 errors generated. 1033654 1 ddkilzer 2014-09-06 05:18:45 -0700 BTW, changing the check from "!this" to "this == nullptr" triggers a different warning: Source/WebCore/rendering/RenderObject.cpp:1460:9: error: 'this' pointer cannot be null in well-defined C++ code; comparison may be assumed to always evaluate to false [-Werror,-Wtautological-undefined-compare] if (this == nullptr) { ^~~~ ~~~~~~~ Source/WebCore/rendering/RenderObject.cpp:1579:9: error: 'this' pointer cannot be null in well-defined C++ code; comparison may be assumed to always evaluate to false [-Werror,-Wtautological-undefined-compare] if (this == nullptr) ^~~~ ~~~~~~~ 2 errors generated. 1033656 2 ddkilzer 2014-09-06 05:49:57 -0700 And adding #pragma statements to ignore the warning causes unknown warnings in older clang: /Volumes/Data/WebKit.git/Source/WebCore/rendering/RenderObject.cpp:1457:34: error: unknown warning group '-Wundefined-bool-conversion', ignored [-Werror,-Wunknown-pragmas] #pragma clang diagnostic ignored "-Wundefined-bool-conversion" ^ /Volumes/Data/WebKit.git/Source/WebCore/rendering/RenderObject.cpp:1576:34: error: unknown warning group '-Wundefined-bool-conversion', ignored [-Werror,-Wunknown-pragmas] #pragma clang diagnostic ignored "-Wundefined-bool-conversion" ^ 2 errors generated. I guess I either need to ignore the unknown warnings in older clangs, or use __has_feature() (assuming that works for compiler flags). 1033659 3 237735 ddkilzer 2014-09-06 06:53:21 -0700 Created attachment 237735 Patch v1 1033668 4 237735 commit-queue 2014-09-06 09:04:36 -0700 Comment on attachment 237735 Patch v1 Clearing flags on attachment: 237735 Committed r173357: <http://trac.webkit.org/changeset/173357> 1033669 5 commit-queue 2014-09-06 09:04:42 -0700 All reviewed patches have been landed. Closing bug. 1033778 6 237735 simon.fraser 2014-09-07 23:11:03 -0700 Comment on attachment 237735 Patch v1 I think we should just remove the null check. We should never get here when |this| is null. It's debug-only code anyway. 1033845 7 zalan 2014-09-08 07:19:37 -0700 (In reply to comment #6) > (From update of attachment 237735 [details]) > I think we should just remove the null check. We should never get here when |this| is null. It's debug-only code anyway. In an lldb session, it's possible to call showRenderTree() on an invalid object. 1033852 8 darin 2014-09-08 08:00:26 -0700 (In reply to comment #7) > (In reply to comment #6) > > (From update of attachment 237735 [details] [details]) > > I think we should just remove the null check. We should never get here when |this| is null. It's debug-only code anyway. > In an lldb session, it's possible to call showRenderTree() on an invalid object. Yes, but if you try it you’ll see there’s no disastrous result. I think we can consider taking out the null checks. Or we could make these non-member functions. I think showRenderTree(x) is just as easy to type in the debugger. 1033853 9 darin 2014-09-08 08:01:50 -0700 I think we should optimize these various dumping functions for easy typing in lldb. For example, I think they should be called showTree, not showRenderTree, and I think that it’s easier to type showTree(x) than x->showTree(). 1033858 10 zalan 2014-09-08 08:16:45 -0700 (In reply to comment #9) > I think we should optimize these various dumping functions for easy typing in lldb. For example, I think they should be called showTree, not showRenderTree, and I think that it’s easier to type showTree(x) than x->showTree(). Currently we've got the following non-member show*Tree() functions. void showNodeTree(const WebCore::RenderObject*); void showLineTree(const WebCore::RenderObject*); void showRenderTree(const WebCore::RenderObject*); and the member helpers: void showNodeTreeForThis() const; void showRenderTreeForThis() const; void showLineTreeForThis() const; so you can type showRenderTree(x) or showRenderTreeForThis() and they output the same when x == this. 1033886 11 darin 2014-09-08 10:25:05 -0700 (In reply to comment #10) > Currently we've got the following non-member show*Tree() functions. > void showNodeTree(const WebCore::RenderObject*); > void showLineTree(const WebCore::RenderObject*); > void showRenderTree(const WebCore::RenderObject*); > > and the member helpers: > void showNodeTreeForThis() const; > void showRenderTreeForThis() const; > void showLineTreeForThis() const; > > so you can type showRenderTree(x) or showRenderTreeForThis() and they output the same when x == this. OK. Lets take the null checks out of the member helpers and put them only in the free functions. Unless that creates any real inconvenience for someone. 1122924 12 zalan 2015-09-02 15:11:22 -0700 Reopening to attach new patch. 1122925 13 260444 zalan 2015-09-02 15:11:26 -0700 Created attachment 260444 Patch 1122932 14 260444 ddkilzer 2015-09-02 15:21:57 -0700 Comment on attachment 260444 Patch r=me 1122935 15 zalan 2015-09-02 15:24:34 -0700 (In reply to comment #13) > Created attachment 260444 [details] > Patch This is a follow up patch based on the discussion above. (tl;dr: there'd be no disastrous result, if this check was removed) 1122943 16 260444 commit-queue 2015-09-02 16:08:47 -0700 Comment on attachment 260444 Patch Rejecting attachment 260444 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 260444, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: ', 'dcommit', '--rmdir']" exit_code: 139 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... Authentication realm: <http://svn.webkit.org:80> Mac OS Forge Password for 'commit-queue@webkit.org': Authentication realm: <http://svn.webkit.org:80> Mac OS Forge Username: error: git-svn died of signal 11 Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 139 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource Current branch master is up to date. Full output: http://webkit-queues.webkit.org/results/134415 1123052 17 260482 zalan 2015-09-02 20:37:16 -0700 Created attachment 260482 Patch 1123060 18 260482 commit-queue 2015-09-02 21:29:32 -0700 Comment on attachment 260482 Patch Rejecting attachment 260482 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 260482, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: ', 'dcommit', '--rmdir']" exit_code: 139 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... Authentication realm: <http://svn.webkit.org:80> Mac OS Forge Password for 'commit-queue@webkit.org': Authentication realm: <http://svn.webkit.org:80> Mac OS Forge Username: error: git-svn died of signal 11 Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 139 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource Current branch master is up to date. Full output: http://webkit-queues.webkit.org/results/135259 1123205 19 260482 commit-queue 2015-09-03 16:23:50 -0700 Comment on attachment 260482 Patch Clearing flags on attachment: 260482 Committed r189310: <http://trac.webkit.org/changeset/189310> 1123206 20 commit-queue 2015-09-03 16:23:56 -0700 All reviewed patches have been landed. Closing bug. 237735 2014-09-06 06:53:21 -0700 2015-09-02 15:11:15 -0700 Patch v1 bug-136599-20140906065306.patch text/plain 3214 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTczMzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGNkMTRjYmMyZGRmMWY1 N2NkZTA2NTA2YzRjNjllZDc5NTU2YjA1Zi4uMjcyMTEwNDgwODUwNzFhNjFiMmZjMzFiZDMwMDdi OTgyNjczNWMwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA5LTA2ICBEYXZp ZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgTmV3IGNsYW5nIHdhcm5z IGFib3V0IGJvb2xlYW4gY2hlY2tzIGZvciB8dGhpc3wgcG9pbnRlciBpbiBSZW5kZXJPYmplY3Qg ZGVidWcgbWV0aG9kcworICAgICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi8xMzY1OTk+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWdub3JlcyB0aGUg Zm9sbG93aW5nIHN0YXRpYyBhbmFseXplciB3YXJuaW5nczoKKworICAgICAgICAgICAgU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6MTQ2NToxMDogZXJyb3I6ICd0aGlz JyBwb2ludGVyIGNhbm5vdCBiZSBudWxsIGluIHdlbGwtZGVmaW5lZCBDKysgY29kZTsgcG9pbnRl ciBtYXkgYmUgYXNzdW1lZCB0byBhbHdheXMgY29udmVydCB0byB0cnVlIFstV2Vycm9yLC1XdW5k ZWZpbmVkLWJvb2wtY29udmVyc2lvbl0KKyAgICAgICAgICAgICAgICBpZiAoIXRoaXMpIHsKKyAg ICAgICAgICAgICAgICAgICAgfl5+fn4KKyAgICAgICAgICAgIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJPYmplY3QuY3BwOjE1ODQ6MTA6IGVycm9yOiAndGhpcycgcG9pbnRlciBjYW5u b3QgYmUgbnVsbCBpbiB3ZWxsLWRlZmluZWQgQysrIGNvZGU7IHBvaW50ZXIgbWF5IGJlIGFzc3Vt ZWQgdG8gYWx3YXlzIGNvbnZlcnQgdG8gdHJ1ZSBbLVdlcnJvciwtV3VuZGVmaW5lZC1ib29sLWNv bnZlcnNpb25dCisgICAgICAgICAgICAgICAgaWYgKCF0aGlzKQorICAgICAgICAgICAgICAgICAg ICB+Xn5+fgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OnNob3dSZW5kZXJPYmplY3QpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyT2JqZWN0OjpzaG93UmVuZGVyU3ViVHJlZUFuZE1hcmspOgorICAgICAgICBB ZGQgIiNwcmFnbWEgY2xhbmciIHByZXByb2Nlc3NvciBtYWNyb3MgdG8gaWdub3JlIHRoaXMgd2Fy bmluZworICAgICAgICBzaW5jZSB0aGUgY29kZSBpcyBvbmx5IGNvbXBpbGVkIGZvciBEZWJ1ZyBi dWlsZHMuICBBbHNvIGFkZCBhCisgICAgICAgIHByYWdtYSBmb3IgdGhlIHByYWdtYSBzbyBvbGRl ciBjbGFuZ3MgZG9uJ3QgY29tcGxhaW4gYWJvdXQgYW4KKyAgICAgICAgdW5rb253biBwcmFnbWEu CisKIDIwMTQtMDktMDYgIFJ5dWFuIENob2kgIDxyeXVhbi5jaG9pQGdtYWlsLmNvbT4KIAogICAg ICAgICBbRUZMXSBEcm9wIGV2YXMgb2JqZWN0IGN1cnNvciBzdXBwb3J0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCmluZGV4IDI0NTllNTNlMWYyYjZmZDZjN2ZiZDg2 OTE3MmUyMWFhMzYzOGFiMTQuLjA3MjNmZDdjNzc0YzAzZWJhYWQzNTk3ZTEyMGY4NTJjMWRkMDdj ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCkBAIC0xNDUy LDExICsxNDUyLDE5IEBAIHZvaWQgUmVuZGVyT2JqZWN0OjpzaG93UmVnaW9uc0luZm9ybWF0aW9u KCkgY29uc3QKIAogdm9pZCBSZW5kZXJPYmplY3Q6OnNob3dSZW5kZXJPYmplY3QoYm9vbCBtYXJr LCBpbnQgZGVwdGgpIGNvbnN0CiB7Ci0gICAgLy8gQXMgdGhpcyBmdW5jdGlvbiBpcyBpbnRlbmRl ZCB0byBiZSB1c2VkIHdoZW4gZGVidWdnaW5nLCB0aGUgdGhpcyBwb2ludGVyIG1heSBiZSAwLgor I2lmIENPTVBJTEVSKENMQU5HKQorI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHB1c2gKKyNwcmFn bWEgY2xhbmcgZGlhZ25vc3RpYyBpZ25vcmVkICItV3Vua25vd24tcHJhZ21hcyIKKyNwcmFnbWEg Y2xhbmcgZGlhZ25vc3RpYyBpZ25vcmVkICItV3VuZGVmaW5lZC1ib29sLWNvbnZlcnNpb24iCisj ZW5kaWYKKyAgICAvLyBBcyB0aGlzIGZ1bmN0aW9uIGlzIGludGVuZGVkIHRvIGJlIHVzZWQgd2hl biBkZWJ1Z2dpbmcsIHRoZSB8dGhpc3wgcG9pbnRlciBtYXkgYmUgMC4KICAgICBpZiAoIXRoaXMp IHsKICAgICAgICAgZnByaW50ZihzdGRlcnIsICIobnVsbClcbiIpOwogICAgICAgICByZXR1cm47 CiAgICAgfQorI2lmIENPTVBJTEVSKENMQU5HKQorI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHBv cAorI2VuZGlmCiAKICAgICBpZiAoaXNQb3NpdGlvbmVkKCkpIHsKICAgICAgICAgaWYgKGlzUmVs UG9zaXRpb25lZCgpKQpAQCAtMTU2NCw4ICsxNTcyLDE3IEBAIHZvaWQgUmVuZGVyT2JqZWN0Ojpz aG93UmVuZGVyT2JqZWN0KGJvb2wgbWFyaywgaW50IGRlcHRoKSBjb25zdAogCiB2b2lkIFJlbmRl ck9iamVjdDo6c2hvd1JlbmRlclN1YlRyZWVBbmRNYXJrKGNvbnN0IFJlbmRlck9iamVjdCogbWFy a2VkT2JqZWN0LCBpbnQgZGVwdGgpIGNvbnN0CiB7CisjaWYgQ09NUElMRVIoQ0xBTkcpCisjcHJh Z21hIGNsYW5nIGRpYWdub3N0aWMgcHVzaAorI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIGlnbm9y ZWQgIi1XdW5rbm93bi1wcmFnbWFzIgorI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIGlnbm9yZWQg Ii1XdW5kZWZpbmVkLWJvb2wtY29udmVyc2lvbiIKKyNlbmRpZgorICAgIC8vIEFzIHRoaXMgZnVu Y3Rpb24gaXMgaW50ZW5kZWQgdG8gYmUgdXNlZCB3aGVuIGRlYnVnZ2luZywgdGhlIHx0aGlzfCBw b2ludGVyIG1heSBiZSAwLgogICAgIGlmICghdGhpcykKICAgICAgICAgcmV0dXJuOworI2lmIENP TVBJTEVSKENMQU5HKQorI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHBvcAorI2VuZGlmCiAKICAg ICBzaG93UmVuZGVyT2JqZWN0KG1hcmtlZE9iamVjdCA9PSB0aGlzLCBkZXB0aCk7CiAgICAgaWYg KGlzUmVuZGVyQmxvY2tGbG93KCkpCg== 260444 2015-09-02 15:11:26 -0700 2015-09-02 20:37:08 -0700 Patch bug-136599-20150902151126.patch text/plain 2491 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGJjOTIzMDNiMzU0YWIz MGY0YjVjMTI1OGI0MTk5NTI4ZWE3MjAxNi4uZTQ4ZDE3OTRlMTQwYzRjNmQxZGY3M2U3NGM0NTA5 OWVjMWFlNWY4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA5LTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgTmV3IGNsYW5nIHdhcm5zIGFi b3V0IGJvb2xlYW4gY2hlY2tzIGZvciB8dGhpc3wgcG9pbnRlciBpbiBSZW5kZXJPYmplY3QgZGVi dWcgbWV0aG9kcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTM2NTk5CisKKyAgICAgICAgUmVtb3ZlIG51bGwgY2hlY2tpbmcuCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm90IHRlc3RhYmxlLgorCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJPYmplY3Q6OnNob3dSZW5kZXJPYmplY3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyT2JqZWN0OjpzaG93UmVuZGVyU3ViVHJlZUFuZE1hcmspOiBEZWxldGVkLgorCiAyMDE1 LTA5LTAyICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBv cnQgVzNDIEluZGV4ZWREQiB0ZXN0cy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9i amVjdC5jcHAKaW5kZXggNmQzMTc1NmQ1OTk3MTM2ZDU0OTJkYjc2YmZmNWRkMzIyODQ4ODJkZS4u NTgyNmM4NTE4N2FmZjFiMTFmMmNjYWU3YWI3ODI2OTg4ZWM2YmQ2MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKQEAgLTEwOTAsMjAgKzEwOTAsNiBAQCB2b2lk IFJlbmRlck9iamVjdDo6c2hvd1JlZ2lvbnNJbmZvcm1hdGlvbigpIGNvbnN0CiAKIHZvaWQgUmVu ZGVyT2JqZWN0OjpzaG93UmVuZGVyT2JqZWN0KGJvb2wgbWFyaywgaW50IGRlcHRoKSBjb25zdAog ewotI2lmIENPTVBJTEVSKENMQU5HKQotI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHB1c2gKLSNw cmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBpZ25vcmVkICItV3Vua25vd24tcHJhZ21hcyIKLSNwcmFn bWEgY2xhbmcgZGlhZ25vc3RpYyBpZ25vcmVkICItV3VuZGVmaW5lZC1ib29sLWNvbnZlcnNpb24i Ci0jZW5kaWYKLSAgICAvLyBBcyB0aGlzIGZ1bmN0aW9uIGlzIGludGVuZGVkIHRvIGJlIHVzZWQg d2hlbiBkZWJ1Z2dpbmcsIHRoZSB8dGhpc3wgcG9pbnRlciBtYXkgYmUgMC4KLSAgICBpZiAoIXRo aXMpIHsKLSAgICAgICAgZnByaW50ZihzdGRlcnIsICIobnVsbClcbiIpOwotICAgICAgICByZXR1 cm47Ci0gICAgfQotI2lmIENPTVBJTEVSKENMQU5HKQotI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGlj IHBvcAotI2VuZGlmCi0KICAgICBpZiAoaXNQb3NpdGlvbmVkKCkpIHsKICAgICAgICAgaWYgKGlz UmVsUG9zaXRpb25lZCgpKQogICAgICAgICAgICAgZnB1dGMoJ1InLCBzdGRlcnIpOwpAQCAtMTIx MCwxOCArMTE5Niw2IEBAIHZvaWQgUmVuZGVyT2JqZWN0OjpzaG93UmVuZGVyT2JqZWN0KGJvb2wg bWFyaywgaW50IGRlcHRoKSBjb25zdAogCiB2b2lkIFJlbmRlck9iamVjdDo6c2hvd1JlbmRlclN1 YlRyZWVBbmRNYXJrKGNvbnN0IFJlbmRlck9iamVjdCogbWFya2VkT2JqZWN0LCBpbnQgZGVwdGgp IGNvbnN0CiB7Ci0jaWYgQ09NUElMRVIoQ0xBTkcpCi0jcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMg cHVzaAotI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIGlnbm9yZWQgIi1XdW5rbm93bi1wcmFnbWFz IgotI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIGlnbm9yZWQgIi1XdW5kZWZpbmVkLWJvb2wtY29u dmVyc2lvbiIKLSNlbmRpZgotICAgIC8vIEFzIHRoaXMgZnVuY3Rpb24gaXMgaW50ZW5kZWQgdG8g YmUgdXNlZCB3aGVuIGRlYnVnZ2luZywgdGhlIHx0aGlzfCBwb2ludGVyIG1heSBiZSBudWxscHRy LgotICAgIGlmICghdGhpcykKLSAgICAgICAgcmV0dXJuOwotI2lmIENPTVBJTEVSKENMQU5HKQot I3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHBvcAotI2VuZGlmCi0KICAgICBzaG93UmVuZGVyT2Jq ZWN0KG1hcmtlZE9iamVjdCA9PSB0aGlzLCBkZXB0aCk7CiAgICAgaWYgKGlzPFJlbmRlckJsb2Nr Rmxvdz4oKnRoaXMpKQogICAgICAgICBkb3duY2FzdDxSZW5kZXJCbG9ja0Zsb3c+KCp0aGlzKS5z aG93TGluZVRyZWVBbmRNYXJrKG51bGxwdHIsIGRlcHRoICsgMSk7Cg== 260482 2015-09-02 20:37:16 -0700 2015-09-03 16:23:50 -0700 Patch bug-136599-20150902203715.patch text/plain 2578 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MjcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmE4NTAxZTQwZDk1OTM5 YWEzZmVlN2U5YWQ2ZjllODU0NDE3MTA2Ni4uYjBjYmE1MTNhM2JlOTg0MmJlMjk4NTU0YzI5MjUy ZDQ2YTllZTY5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA5LTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgTmV3IGNsYW5nIHdhcm5zIGFi b3V0IGJvb2xlYW4gY2hlY2tzIGZvciB8dGhpc3wgcG9pbnRlciBpbiBSZW5kZXJPYmplY3QgZGVi dWcgbWV0aG9kcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTM2NTk5CisKKyAgICAgICAgUmVtb3ZlIHVubmVjZXNzYXJ5IG51bGwgY2hlY2tpbmcuCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgS2lsemVyLgorCisgICAgICAgIE5vdCB0ZXN0YWJs ZS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyT2JqZWN0OjpzaG93UmVuZGVyT2JqZWN0KTogRGVsZXRlZC4KKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlck9iamVjdDo6c2hvd1JlbmRlclN1YlRyZWVBbmRNYXJrKTogRGVsZXRl ZC4KKwogMjAxNS0wOS0wMiAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAg ICAgICBNdXRhdGlvbk9ic2VydmVyIHNob3VsZCBhY2NlcHQgYXR0cmlidXRlRmlsdGVyLCBhdHRy aWJ1dGVPbGRWYWx1ZSwgYW5kIGNoYXJhY3RlckRhdGFPbGRWYWx1ZSBvbiB0aGVpciBvd24KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKaW5kZXggNmQzMTc1NmQ1OTk3 MTM2ZDU0OTJkYjc2YmZmNWRkMzIyODQ4ODJkZS4uNTgyNmM4NTE4N2FmZjFiMTFmMmNjYWU3YWI3 ODI2OTg4ZWM2YmQ2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5j cHAKQEAgLTEwOTAsMjAgKzEwOTAsNiBAQCB2b2lkIFJlbmRlck9iamVjdDo6c2hvd1JlZ2lvbnNJ bmZvcm1hdGlvbigpIGNvbnN0CiAKIHZvaWQgUmVuZGVyT2JqZWN0OjpzaG93UmVuZGVyT2JqZWN0 KGJvb2wgbWFyaywgaW50IGRlcHRoKSBjb25zdAogewotI2lmIENPTVBJTEVSKENMQU5HKQotI3By YWdtYSBjbGFuZyBkaWFnbm9zdGljIHB1c2gKLSNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBpZ25v cmVkICItV3Vua25vd24tcHJhZ21hcyIKLSNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBpZ25vcmVk ICItV3VuZGVmaW5lZC1ib29sLWNvbnZlcnNpb24iCi0jZW5kaWYKLSAgICAvLyBBcyB0aGlzIGZ1 bmN0aW9uIGlzIGludGVuZGVkIHRvIGJlIHVzZWQgd2hlbiBkZWJ1Z2dpbmcsIHRoZSB8dGhpc3wg cG9pbnRlciBtYXkgYmUgMC4KLSAgICBpZiAoIXRoaXMpIHsKLSAgICAgICAgZnByaW50ZihzdGRl cnIsICIobnVsbClcbiIpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotI2lmIENPTVBJTEVSKENM QU5HKQotI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHBvcAotI2VuZGlmCi0KICAgICBpZiAoaXNQ b3NpdGlvbmVkKCkpIHsKICAgICAgICAgaWYgKGlzUmVsUG9zaXRpb25lZCgpKQogICAgICAgICAg ICAgZnB1dGMoJ1InLCBzdGRlcnIpOwpAQCAtMTIxMCwxOCArMTE5Niw2IEBAIHZvaWQgUmVuZGVy T2JqZWN0OjpzaG93UmVuZGVyT2JqZWN0KGJvb2wgbWFyaywgaW50IGRlcHRoKSBjb25zdAogCiB2 b2lkIFJlbmRlck9iamVjdDo6c2hvd1JlbmRlclN1YlRyZWVBbmRNYXJrKGNvbnN0IFJlbmRlck9i amVjdCogbWFya2VkT2JqZWN0LCBpbnQgZGVwdGgpIGNvbnN0CiB7Ci0jaWYgQ09NUElMRVIoQ0xB TkcpCi0jcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgcHVzaAotI3ByYWdtYSBjbGFuZyBkaWFnbm9z dGljIGlnbm9yZWQgIi1XdW5rbm93bi1wcmFnbWFzIgotI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGlj IGlnbm9yZWQgIi1XdW5kZWZpbmVkLWJvb2wtY29udmVyc2lvbiIKLSNlbmRpZgotICAgIC8vIEFz IHRoaXMgZnVuY3Rpb24gaXMgaW50ZW5kZWQgdG8gYmUgdXNlZCB3aGVuIGRlYnVnZ2luZywgdGhl IHx0aGlzfCBwb2ludGVyIG1heSBiZSBudWxscHRyLgotICAgIGlmICghdGhpcykKLSAgICAgICAg cmV0dXJuOwotI2lmIENPTVBJTEVSKENMQU5HKQotI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHBv cAotI2VuZGlmCi0KICAgICBzaG93UmVuZGVyT2JqZWN0KG1hcmtlZE9iamVjdCA9PSB0aGlzLCBk ZXB0aCk7CiAgICAgaWYgKGlzPFJlbmRlckJsb2NrRmxvdz4oKnRoaXMpKQogICAgICAgICBkb3du Y2FzdDxSZW5kZXJCbG9ja0Zsb3c+KCp0aGlzKS5zaG93TGluZVRyZWVBbmRNYXJrKG51bGxwdHIs IGRlcHRoICsgMSk7Cg==