144395 2015-04-29 10:07:27 -0700 check-webkit-style: Don't complain about returning value from Objective-C method call in header 2015-04-29 12:34:16 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ddkilzer ddkilzer achristensen aestes bfulgham commit-queue ddkilzer dino fpizlo glenn mitz oldest_to_newest 1090043 0 ddkilzer 2015-04-29 10:07:27 -0700 In Bug 144362, an inline method was added to SoftLinking.h that returned the value from an Objective-C method call: + inline className *alloc##className##Instance() \ + { \ + return [get_##framework##_##className##Class() alloc]; \ + } \ However, check-webkit-style incorrectly flagged this as a style issue (see Bug 144362, Comment #24): ERROR: Source/WebCore/platform/mac/SoftLinking.h:327: Extra space before [ [whitespace/braces] [5] Additional issues noted while investigating this: - The category should be "whitespace/brackets", not "whitespace/braces". - There is no test coverage for the code that checks for "whitespace/brackets". 1090052 1 251962 ddkilzer 2015-04-29 10:19:15 -0700 Created attachment 251962 Patch v1 1090117 2 251962 commit-queue 2015-04-29 12:34:10 -0700 Comment on attachment 251962 Patch v1 Clearing flags on attachment: 251962 Committed r183567: <http://trac.webkit.org/changeset/183567> 1090118 3 commit-queue 2015-04-29 12:34:16 -0700 All reviewed patches have been landed. Closing bug. 251962 2015-04-29 10:19:15 -0700 2015-04-29 12:34:10 -0700 Patch v1 bug-144395-20150429101805.patch text/plain 4861 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNTUzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWY0NzZjZjk4OWMyNzdlNDZhYWU5Yzc2NTNhOTAwOGIz MDE3OTM3MC4uNTcwZmJhMzExZmRlZDFhZDQwODExZWFhNDZlYzFkYTQzMTU2NTQ5MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDE1LTA0LTI5ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg ICAgICAgY2hlY2std2Via2l0LXN0eWxlOiBEb24ndCBjb21wbGFpbiBhYm91dCByZXR1cm5pbmcg dmFsdWUgZnJvbSBPYmplY3RpdmUtQyBtZXRob2QgY2FsbCBpbiBoZWFkZXIKKyAgICAgICAgPGh0 dHA6Ly93ZWJraXQub3JnL2IvMTQ0Mzk1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHAu cHk6CisgICAgICAgIChjaGVja19zcGFjaW5nKTogVXBkYXRlIHJlZ2V4IHNvICdyZXR1cm4nIGlz IGlnbm9yZWQgaWYgaXQKKyAgICAgICAgcHJlY2VkZXMgdGhlIHdoaXRlc3BhY2UgYW5kIGJyYWNr ZXQuICBDaGFuZ2UgY2F0ZWdvcnkgbmFtZSB0bworICAgICAgICAnd2hpdGVzcGFjZS9icmFja2V0 cycuICBBZGQgcGVyaW9kIHRvIGVycm9yIG1lc3NhZ2UuCisgICAgICAgIChDcHBDaGVja2VyKTog QWRkICd3aGl0ZXNwYWNlL2JyYWNrZXRzJyBhcyBhIGNhdGVnb3J5LgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5OgorICAgICAgICAoRXJy b3JDb2xsZWN0b3IuX19jYWxsX18pOiBSZXBsYWNlICdTVFlMRV9DQVRFR09SSUVTJyB3aXRoCisg ICAgICAgICdDcHBDaGVja2VyLmNhdGVnb3JpZXMnIHNpbmNlIHRoYXQncyB3aGVyZSB0aGUgbGlz dCBsaXZlcyBub3cuCisgICAgICAgIChDcHBTdHlsZVRlc3QudGVzdF9zcGFjaW5nX2JlZm9yZV9i cmFja2V0cyk6IEFkZCB0ZXN0cyBmb3IKKyAgICAgICAgJ3doaXRlc3BhY2UvYnJhY2tldHMnIGlz c3VlcyBhbmQgbm9uLWlzc3Vlcy4KKwogMjAxNS0wNC0yOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3Mg IDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IC93ZWJraXQy L1dlYktpdFdlYkluc3BlY3RvclNlcnZlci90ZXN0LW9wZW4tZGVidWdnaW5nLXNlc3Npb24uCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CmluZGV4IGE3OTMx Y2ExM2YzY2RkMDFlYTcxMTE0OTk1MWU4YzM0NDZkMmE2NGYuLjAxNTQyMjVmZjU0Yzc5ZWEyYmVh MzliZjEwMzA1NDJhZDJhOTcwZTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv c3R5bGUvY2hlY2tlcnMvY3BwLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUv Y2hlY2tlcnMvY3BwLnB5CkBAIC0yMDA1LDkgKzIwMDUsOSBAQCBkZWYgY2hlY2tfc3BhY2luZyhm aWxlX2V4dGVuc2lvbiwgY2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLCBlcnJvcik6CiAgICAgIyAn ZGVsZXRlIFtdJyBvciAnbmV3IGNoYXIgKiBbXScuIE9iamVjdGl2ZS1DIGNhbid0IGZvbGxvdyB0 aGlzIHJ1bGUKICAgICAjIGJlY2F1c2Ugb2YgbWV0aG9kIGNhbGxzLgogICAgIGlmIGZpbGVfZXh0 ZW5zaW9uICE9ICdtbScgYW5kIGZpbGVfZXh0ZW5zaW9uICE9ICdtJzoKLSAgICAgICAgaWYgc2Vh cmNoKHInXHdccytcWycsIGxpbmUpIGFuZCBub3Qgc2VhcmNoKHInZGVsZXRlXHMrXFsnLCBsaW5l KToKLSAgICAgICAgICAgIGVycm9yKGxpbmVfbnVtYmVyLCAnd2hpdGVzcGFjZS9icmFjZXMnLCA1 LAotICAgICAgICAgICAgICAgICAgJ0V4dHJhIHNwYWNlIGJlZm9yZSBbJykKKyAgICAgICAgaWYg c2VhcmNoKHInXHdccytcWycsIGxpbmUpIGFuZCBub3Qgc2VhcmNoKHInKGRlbGV0ZXxyZXR1cm4p XHMrXFsnLCBsaW5lKToKKyAgICAgICAgICAgIGVycm9yKGxpbmVfbnVtYmVyLCAnd2hpdGVzcGFj ZS9icmFja2V0cycsIDUsCisgICAgICAgICAgICAgICAgICAnRXh0cmEgc3BhY2UgYmVmb3JlIFsu JykKIAogICAgICMgVGhlcmUgc2hvdWxkIGFsd2F5cyBiZSBhIHNpbmdsZSBzcGFjZSBpbiBiZXR3 ZWVuIGJyYWNlcyBvbiB0aGUgc2FtZSBsaW5lLgogICAgIGlmIHNlYXJjaChyJ1x7XH0nLCBsaW5l KToKQEAgLTM4OTUsNiArMzg5NSw3IEBAIGNsYXNzIENwcENoZWNrZXIob2JqZWN0KToKICAgICAg ICAgJ3J1bnRpbWUvd3RmX21vdmUnLAogICAgICAgICAnd2hpdGVzcGFjZS9ibGFua19saW5lJywK ICAgICAgICAgJ3doaXRlc3BhY2UvYnJhY2VzJywKKyAgICAgICAgJ3doaXRlc3BhY2UvYnJhY2tl dHMnLAogICAgICAgICAnd2hpdGVzcGFjZS9jb2xvbicsCiAgICAgICAgICd3aGl0ZXNwYWNlL2Nv bW1hJywKICAgICAgICAgJ3doaXRlc3BhY2UvY29tbWVudHMnLApkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHBfdW5pdHRlc3QucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcF91bml0dGVzdC5weQppbmRleCBmZTMz NDYyNTVjNzQ0NDgzZDQ1YjJlNTg4MzM0NzQ4ZDc2MjZjZjZlLi4yMDJhY2QzOTI5NDUzMjNjOTQ2 ZjRjMmM2ZWY0M2YzMTc3Mzg5OGNkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3N0eWxlL2NoZWNrZXJzL2NwcF91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3N0eWxlL2NoZWNrZXJzL2NwcF91bml0dGVzdC5weQpAQCAtNDYsNyArNDYsNyBAQCBmcm9t IC4uZmlsdGVyIGltcG9ydCBGaWx0ZXJDb25maWd1cmF0aW9uCiAKICMgVGhpcyBjbGFzcyB3b3Jr cyBhcyBhbiBlcnJvciBjb2xsZWN0b3IgYW5kIHJlcGxhY2VzIGNwcF9zdHlsZS5FcnJvcgogIyBm dW5jdGlvbiBmb3IgdGhlIHVuaXQgdGVzdHMuICBXZSBhbHNvIHZlcmlmeSBlYWNoIGNhdGVnb3J5 IHdlIHNlZQotIyBpcyBpbiBTVFlMRV9DQVRFR09SSUVTLCB0byBoZWxwIGtlZXAgdGhhdCBsaXN0 IHVwIHRvIGRhdGUuCisjIGlzIGluIENwcENoZWNrZXIuY2F0ZWdvcmllcywgdG8gaGVscCBrZWVw IHRoYXQgbGlzdCB1cCB0byBkYXRlLgogY2xhc3MgRXJyb3JDb2xsZWN0b3I6CiAgICAgX2FsbF9z dHlsZV9jYXRlZ29yaWVzID0gQ3BwQ2hlY2tlci5jYXRlZ29yaWVzCiAgICAgIyBUaGlzIGlzIGEg bGlzdCBpbmNsdWRpbmcgYWxsIGNhdGVnb3JpZXMgc2VlbiBpbiBhbnkgdW5pdCB0ZXN0LgpAQCAt NjUsNyArNjUsNyBAQCBjbGFzcyBFcnJvckNvbGxlY3RvcjoKICAgICBkZWYgX19jYWxsX18oc2Vs ZiwgbGluZV9udW1iZXIsIGNhdGVnb3J5LCBjb25maWRlbmNlLCBtZXNzYWdlKToKICAgICAgICAg c2VsZi5fYXNzZXJ0X2ZuKGNhdGVnb3J5IGluIHNlbGYuX2FsbF9zdHlsZV9jYXRlZ29yaWVzLAog ICAgICAgICAgICAgICAgICAgICAgICAgJ01lc3NhZ2UgIiVzIiBoYXMgY2F0ZWdvcnkgIiVzIiwn Ci0gICAgICAgICAgICAgICAgICAgICAgICAnIHdoaWNoIGlzIG5vdCBpbiBTVFlMRV9DQVRFR09S SUVTJyAlIChtZXNzYWdlLCBjYXRlZ29yeSkpCisgICAgICAgICAgICAgICAgICAgICAgICAnIHdo aWNoIGlzIG5vdCBpbiBDcHBDaGVja2VyLmNhdGVnb3JpZXMnICUgKG1lc3NhZ2UsIGNhdGVnb3J5 KSkKIAogICAgICAgICBpZiBzZWxmLl9saW5lc190b19jaGVjayBhbmQgbm90IGxpbmVfbnVtYmVy IGluIHNlbGYuX2xpbmVzX3RvX2NoZWNrOgogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCkBAIC0x NzMwLDYgKzE3MzAsMTQgQEAgY2xhc3MgQ3BwU3R5bGVUZXN0KENwcFN0eWxlVGVzdEJhc2UpOgog ICAgICAgICBzZWxmLmFzc2VydF9saW50KCcgICAge30nLCAnTWlzc2luZyBzcGFjZSBpbnNpZGUg eyB9LiAgW3doaXRlc3BhY2UvYnJhY2VzXSBbNV0nKQogICAgICAgICBzZWxmLmFzc2VydF9saW50 KCcgICAgeyAgIH0nLCAnVG9vIG1hbnkgc3BhY2VzIGluc2lkZSB7IH0uICBbd2hpdGVzcGFjZS9i cmFjZXNdIFs1XScpCiAKKyAgICBkZWYgdGVzdF9zcGFjaW5nX2JlZm9yZV9icmFja2V0cyhzZWxm KToKKyAgICAgICAgc2VsZi5hc3NlcnRfbGludCgnZGVsZXRlIFtdIGJhc2U7JywgJycpCisgICAg ICAgICMgU2VlIFNPRlRfTElOS19DTEFTU19GT1JfSEVBREVSKCkgbWFjcm8gaW4gU29mdExpbmtp bmcuaC4KKyAgICAgICAgc2VsZi5hc3NlcnRfbGludCgnICAgICAgICByZXR1cm4gW2dldF8jI2Zy YW1ld29yayMjXyMjY2xhc3NOYW1lIyNDbGFzcygpIGFsbG9jXTsgXFwnLCAnJykKKyAgICAgICAg c2VsZi5hc3NlcnRfbGludCgnICAgICAgICBtX3Rhc2tGdW5jdGlvbiA9IFtjYWxsZWUsIG1ldGhv ZCwgYXJndW1lbnRzLi4uXSB7JywgJycpCisgICAgICAgIHNlbGYuYXNzZXJ0X2xpbnQoJ2ludCBt YWluKGludCBhcmdjLCBjaGFyKiBhZ3J2IFtdKScsICdFeHRyYSBzcGFjZSBiZWZvcmUgWy4gIFt3 aGl0ZXNwYWNlL2JyYWNrZXRzXSBbNV0nKQorICAgICAgICBzZWxmLmFzc2VydF9saW50KCcgICAg c3RyIFtzdHJMZW5ndGhdID0gXCdcXDBcJzsnLCAnRXh0cmEgc3BhY2UgYmVmb3JlIFsuICBbd2hp dGVzcGFjZS9icmFja2V0c10gWzVdJykKKwogICAgIGRlZiB0ZXN0X3NwYWNpbmdfYXJvdW5kX2Vs c2Uoc2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0X2xpbnQoJ31lbHNlIHsnLCAnTWlzc2luZyBz cGFjZSBiZWZvcmUgZWxzZScKICAgICAgICAgICAgICAgICAgICAgICAgICAnICBbd2hpdGVzcGFj ZS9icmFjZXNdIFs1XScpCg==