44870 2010-08-30 07:29:45 -0700 Modify ASSERT_UNUSED and UNUSED_PARAM similar to Qt's Q_UNUSED 2010-08-31 09:56:10 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 44593 1 ossy webkit-unassigned darin eric webkit-ews oldest_to_newest 271423 0 ossy 2010-08-30 07:29:45 -0700 Q_UNUSED is more specific than a simple (void)x , so ASSERT_UNUSED should call Q_UNUSED for Qt builds to make ICC and RVCT happy. ASSERT_UNUSED: -------------- #define ASSERT_UNUSED(variable, assertion) ((void)variable) Q_UNUSED: --------- #if defined(Q_CC_INTEL) && !defined(Q_OS_WIN) || defined(Q_CC_RVCT) template <typename T> inline void qUnused(T &x) { (void)x; } # define Q_UNUSED(x) qUnused(x); #else # define Q_UNUSED(x) (void)x; #endif 271427 1 65912 ossy 2010-08-30 07:36:16 -0700 Created attachment 65912 proposed patch I didn't test it locally, please let EWS to do it before review. 271429 2 65912 tonikitoo 2010-08-30 07:42:00 -0700 Comment on attachment 65912 proposed patch r=me Please set cq+ or manually checkin when bots gets green. 271432 3 webkit-ews 2010-08-30 07:55:15 -0700 Attachment 65912 did not build on qt: Build output: http://queues.webkit.org/results/3815170 271433 4 65912 ossy 2010-08-30 08:05:16 -0700 Comment on attachment 65912 proposed patch patch is incorrect, fix is coming soon 271441 5 65915 ossy 2010-08-30 08:21:28 -0700 Created attachment 65915 proposed patch - include added - incorrect paranthesis removed - tested locally :) 271454 6 darin 2010-08-30 09:03:53 -0700 What about UNUSED_PARAM? What about non-Qt platforms? I’d like to see both ASSERT_UNUSED and UNUSED_PARAM use the best technique available. Probably they would just do it directly instead of using Q_UNUSED. 271470 7 65925 ossy 2010-08-30 09:45:21 -0700 Created attachment 65925 proposed patch UNUSED_PARAM use Q_UNUSED too 271471 8 ossy 2010-08-30 09:48:08 -0700 (In reply to comment #6) > What about UNUSED_PARAM? What about non-Qt platforms? > > I’d like to see both ASSERT_UNUSED and UNUSED_PARAM use the best technique available. Probably they would just do it directly instead of using Q_UNUSED. Do you mean we should copy and use the logic of Q_UNUSED instead of using Q_UNUSED? 271481 9 eric 2010-08-30 10:10:35 -0700 Attachment 65925 did not build on mac: Build output: http://queues.webkit.org/results/3870149 271483 10 darin 2010-08-30 10:12:11 -0700 (In reply to comment #8) > (In reply to comment #6) > > What about UNUSED_PARAM? What about non-Qt platforms? > > > > I’d like to see both ASSERT_UNUSED and UNUSED_PARAM use the best technique available. Probably they would just do it directly instead of using Q_UNUSED. > > Do you mean we should copy and use the logic of Q_UNUSED instead of using Q_UNUSED? Yes. We’d want to do that if there are any non-Qt ports that also work with the compilers that require the alternate technique. And if we did that, then we could avoid having any Qt-specific code. In the end, I don’t care whether we use Q_UNUSED or not, I just want the macros to work well for everyone. 271992 11 66023 ossy 2010-08-31 02:36:55 -0700 Created attachment 66023 proposed patch I refactored ASSERT_UNUSED and UNUSED_PARAM to have similar behavior as Qt's Q_UNUSED. If this patch will be landed, we won't need to use Q_UNUSED anymore. 272105 12 66023 darin 2010-08-31 08:11:15 -0700 Comment on attachment 66023 proposed patch Formatting isn’t quite right. We normally put the "&" next to the "T". We normally don’t put a space after the keyword "template". And the names of the functions aren't quite right either. But I think we can live with it like this, so r=me 272156 13 ossy 2010-08-31 09:56:10 -0700 (In reply to comment #12) > (From update of attachment 66023 [details]) > Formatting isn’t quite right. We normally put the "&" next to the "T". We normally don’t put a space after the keyword "template". And the names of the functions aren't quite right either. But I think we can live with it like this, so r=me I fixed style errors ( T& and template<...> ), and then landed it: http://trac.webkit.org/changeset/66489 65912 2010-08-30 07:36:16 -0700 2010-08-30 08:21:28 -0700 proposed patch 1.patch text/plain 1081 ossy ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCAyN2VhM2IwLi42NmQxMGQ5IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIg QEAKKzIwMTAtMDgtMzAgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEFTU0VS VF9VTlVTRUQgc2hvdWxkIGNhbGwgUV9VTlVTRUQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0ODcwCisKKyAgICAgICAgKiB3dGYvQXNzZXJ0aW9ucy5o OiBBU1NFUlRfVU5VU0VEIGNhbGwgUV9VTlVTRUQgaWYgUExBVEZPUk0oUVQpIGlzIHRydWUuCisK IDIwMTAtMDgtMzAgIFpvbHRhbiBIZXJjemVnICA8emhlcmN6ZWdAd2Via2l0Lm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3Jl L3d0Zi9Bc3NlcnRpb25zLmggYi9KYXZhU2NyaXB0Q29yZS93dGYvQXNzZXJ0aW9ucy5oCmluZGV4 IGFmZWFlMGMuLjRhYjI0MjIgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL3d0Zi9Bc3NlcnRp b25zLmgKKysrIGIvSmF2YVNjcmlwdENvcmUvd3RmL0Fzc2VydGlvbnMuaApAQCAtMjEyLDcgKzIx MiwxMiBAQCB2b2lkIFdURkxvZ1ZlcmJvc2UoY29uc3QgY2hhciogZmlsZSwgaW50IGxpbmUsIGNv bnN0IGNoYXIqIGZ1bmN0aW9uLCBXVEZMb2dDaGFubgogCiAjZGVmaW5lIEFTU0VSVChhc3NlcnRp b24pICgodm9pZCkwKQogI2RlZmluZSBBU1NFUlRfTk9UX1JFQUNIRUQoKSAoKHZvaWQpMCkKKwor I2lmIFBMQVRGT1JNKFFUKQorI2RlZmluZSBBU1NFUlRfVU5VU0VEKHZhcmlhYmxlLCBhc3NlcnRp b24pIChRX1VOVVNFRCh2YXJpYWJsZSkpCisjZWxzZQogI2RlZmluZSBBU1NFUlRfVU5VU0VEKHZh cmlhYmxlLCBhc3NlcnRpb24pICgodm9pZCl2YXJpYWJsZSkKKyNlbmRpZgogCiAjZWxzZQogCg== 65915 2010-08-30 08:21:28 -0700 2010-08-30 09:45:21 -0700 proposed patch 1b.patch text/plain 1282 ossy ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCAyN2VhM2IwLi42NmQxMGQ5IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIg QEAKKzIwMTAtMDgtMzAgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEFTU0VS VF9VTlVTRUQgc2hvdWxkIGNhbGwgUV9VTlVTRUQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0ODcwCisKKyAgICAgICAgKiB3dGYvQXNzZXJ0aW9ucy5o OiBBU1NFUlRfVU5VU0VEIGNhbGwgUV9VTlVTRUQgaWYgUExBVEZPUk0oUVQpIGlzIHRydWUuCisK IDIwMTAtMDgtMzAgIFpvbHRhbiBIZXJjemVnICA8emhlcmN6ZWdAd2Via2l0Lm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3Jl L3d0Zi9Bc3NlcnRpb25zLmggYi9KYXZhU2NyaXB0Q29yZS93dGYvQXNzZXJ0aW9ucy5oCmluZGV4 IGFmZWFlMGMuLjU0OWVkZjcgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL3d0Zi9Bc3NlcnRp b25zLmgKKysrIGIvSmF2YVNjcmlwdENvcmUvd3RmL0Fzc2VydGlvbnMuaApAQCAtNTksNiArNTks MTAgQEAKICNpbmNsdWRlIDxBRUVTdGRMaWIuaD4KICNlbmRpZgogCisjaWYgUExBVEZPUk0oUVQp CisjaW5jbHVkZSA8UXRHbG9iYWw+CisjZW5kaWYKKwogI2lmZGVmIE5ERUJVRwogLyogRGlzYWJs ZSBBU1NFUlQqIG1hY3JvcyBpbiByZWxlYXNlIG1vZGUuICovCiAjZGVmaW5lIEFTU0VSVElPTlNf RElTQUJMRURfREVGQVVMVCAxCkBAIC0yMTIsNyArMjE2LDEyIEBAIHZvaWQgV1RGTG9nVmVyYm9z ZShjb25zdCBjaGFyKiBmaWxlLCBpbnQgbGluZSwgY29uc3QgY2hhciogZnVuY3Rpb24sIFdURkxv Z0NoYW5uCiAKICNkZWZpbmUgQVNTRVJUKGFzc2VydGlvbikgKCh2b2lkKTApCiAjZGVmaW5lIEFT U0VSVF9OT1RfUkVBQ0hFRCgpICgodm9pZCkwKQorCisjaWYgUExBVEZPUk0oUVQpCisjZGVmaW5l IEFTU0VSVF9VTlVTRUQodmFyaWFibGUsIGFzc2VydGlvbikgUV9VTlVTRUQodmFyaWFibGUpCisj ZWxzZQogI2RlZmluZSBBU1NFUlRfVU5VU0VEKHZhcmlhYmxlLCBhc3NlcnRpb24pICgodm9pZCl2 YXJpYWJsZSkKKyNlbmRpZgogCiAjZWxzZQogCg== 65925 2010-08-30 09:45:21 -0700 2010-08-31 02:36:55 -0700 proposed patch 1.patch text/plain 1905 ossy ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCAyN2VhM2IwLi41ZDAzMTljIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTAtMDgtMzAgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEFTU0VS VF9VTlVTRUQgc2hvdWxkIGNhbGwgUV9VTlVTRUQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0ODcwCisKKyAgICAgICAgKiB3dGYvQXNzZXJ0aW9ucy5o OiBBU1NFUlRfVU5VU0VEIGNhbGwgUV9VTlVTRUQgaWYgUExBVEZPUk0oUVQpIGlzIHRydWUuCisg ICAgICAgICogd3RmL1VudXNlZFBhcmFtLmg6IFVOVVNFRF9QQVJBTSBjYWxsIFFfVU5VU0VEIGlm IFBMQVRGT1JNKFFUKSBpcyB0cnVlLgorCiAyMDEwLTA4LTMwICBab2x0YW4gSGVyY3plZyAgPHpo ZXJjemVnQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRp ZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS93dGYvQXNzZXJ0aW9ucy5oIGIvSmF2YVNjcmlwdENv cmUvd3RmL0Fzc2VydGlvbnMuaAppbmRleCBhZmVhZTBjLi41NDllZGY3IDEwMDY0NAotLS0gYS9K YXZhU2NyaXB0Q29yZS93dGYvQXNzZXJ0aW9ucy5oCisrKyBiL0phdmFTY3JpcHRDb3JlL3d0Zi9B c3NlcnRpb25zLmgKQEAgLTU5LDYgKzU5LDEwIEBACiAjaW5jbHVkZSA8QUVFU3RkTGliLmg+CiAj ZW5kaWYKIAorI2lmIFBMQVRGT1JNKFFUKQorI2luY2x1ZGUgPFF0R2xvYmFsPgorI2VuZGlmCisK ICNpZmRlZiBOREVCVUcKIC8qIERpc2FibGUgQVNTRVJUKiBtYWNyb3MgaW4gcmVsZWFzZSBtb2Rl LiAqLwogI2RlZmluZSBBU1NFUlRJT05TX0RJU0FCTEVEX0RFRkFVTFQgMQpAQCAtMjEyLDcgKzIx NiwxMiBAQCB2b2lkIFdURkxvZ1ZlcmJvc2UoY29uc3QgY2hhciogZmlsZSwgaW50IGxpbmUsIGNv bnN0IGNoYXIqIGZ1bmN0aW9uLCBXVEZMb2dDaGFubgogCiAjZGVmaW5lIEFTU0VSVChhc3NlcnRp b24pICgodm9pZCkwKQogI2RlZmluZSBBU1NFUlRfTk9UX1JFQUNIRUQoKSAoKHZvaWQpMCkKKwor I2lmIFBMQVRGT1JNKFFUKQorI2RlZmluZSBBU1NFUlRfVU5VU0VEKHZhcmlhYmxlLCBhc3NlcnRp b24pIFFfVU5VU0VEKHZhcmlhYmxlKQorI2Vsc2UKICNkZWZpbmUgQVNTRVJUX1VOVVNFRCh2YXJp YWJsZSwgYXNzZXJ0aW9uKSAoKHZvaWQpdmFyaWFibGUpCisjZW5kaWYKIAogI2Vsc2UKIApkaWZm IC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvd3RmL1VudXNlZFBhcmFtLmggYi9KYXZhU2NyaXB0Q29y ZS93dGYvVW51c2VkUGFyYW0uaAppbmRleCA5OTZmNWM4Li44YTUyNTQxIDEwMDY0NAotLS0gYS9K YXZhU2NyaXB0Q29yZS93dGYvVW51c2VkUGFyYW0uaAorKysgYi9KYXZhU2NyaXB0Q29yZS93dGYv VW51c2VkUGFyYW0uaApAQCAtMjQsNiArMjQsMTQgQEAKIC8qIGRvbid0IHVzZSB0aGlzIGZvciBD KyssIGl0IHNob3VsZCBvbmx5IGJlIHVzZWQgaW4gcGxhaW4gQyBmaWxlcyBvcgogICAgT2JqQyBt ZXRob2RzLCB3aGVyZSBsZWF2aW5nIG9mZiB0aGUgcGFyYW1ldGVyIG5hbWUgaXMgbm90IGFsbG93 ZWQuICovCiAKKyNpZiBQTEFURk9STShRVCkKKyNpbmNsdWRlIDxRdEdsb2JhbD4KKyNlbmRpZgor CisjaWYgUExBVEZPUk0oUVQpCisjZGVmaW5lIFVOVVNFRF9QQVJBTSh4KSBRX1VOVVNFRCh4KQor I2Vsc2UKICNkZWZpbmUgVU5VU0VEX1BBUkFNKHgpICh2b2lkKXgKKyNlbmRpZgogCiAjZW5kaWYg LyogV1RGX1VudXNlZFBhcmFtX2ggKi8K 66023 2010-08-31 02:36:55 -0700 2010-08-31 08:11:15 -0700 proposed patch 2.patch text/plain 1876 ossy ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCAyN2VhM2IwLi5jNjFkYjhhIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTAtMDgtMzAgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb2RpZnkgQVNT RVJUX1VOVVNFRCBhbmQgVU5VU0VEX1BBUkFNIHNpbWlsYXIgdG8gUXQncyBRX1VOVVNFRC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0ODcwCisKKyAg ICAgICAgKiB3dGYvQXNzZXJ0aW9ucy5oOgorICAgICAgICAqIHd0Zi9VbnVzZWRQYXJhbS5oOgor CiAyMDEwLTA4LTMwICBab2x0YW4gSGVyY3plZyAgPHpoZXJjemVnQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29y ZS93dGYvQXNzZXJ0aW9ucy5oIGIvSmF2YVNjcmlwdENvcmUvd3RmL0Fzc2VydGlvbnMuaAppbmRl eCBhZmVhZTBjLi42OTcwZmRhIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS93dGYvQXNzZXJ0 aW9ucy5oCisrKyBiL0phdmFTY3JpcHRDb3JlL3d0Zi9Bc3NlcnRpb25zLmgKQEAgLTIxMiw3ICsy MTIsMTQgQEAgdm9pZCBXVEZMb2dWZXJib3NlKGNvbnN0IGNoYXIqIGZpbGUsIGludCBsaW5lLCBj b25zdCBjaGFyKiBmdW5jdGlvbiwgV1RGTG9nQ2hhbm4KIAogI2RlZmluZSBBU1NFUlQoYXNzZXJ0 aW9uKSAoKHZvaWQpMCkKICNkZWZpbmUgQVNTRVJUX05PVF9SRUFDSEVEKCkgKCh2b2lkKTApCisK KyNpZiBDT01QSUxFUihJTlRFTCkgJiYgIU9TKFdJTkRPV1MpIHx8IENPTVBJTEVSKFJWQ1QpCit0 ZW1wbGF0ZSA8dHlwZW5hbWUgVD4KK2lubGluZSB2b2lkIGFzc2VydFVudXNlZChUICZ4KSB7ICh2 b2lkKXg7IH0KKyNkZWZpbmUgQVNTRVJUX1VOVVNFRCh2YXJpYWJsZSwgYXNzZXJ0aW9uKSAoYXNz ZXJ0VW51c2VkKHZhcmlhYmxlKSkKKyNlbHNlCiAjZGVmaW5lIEFTU0VSVF9VTlVTRUQodmFyaWFi bGUsIGFzc2VydGlvbikgKCh2b2lkKXZhcmlhYmxlKQorI2VuZGlmCiAKICNlbHNlCiAKZGlmZiAt LWdpdCBhL0phdmFTY3JpcHRDb3JlL3d0Zi9VbnVzZWRQYXJhbS5oIGIvSmF2YVNjcmlwdENvcmUv d3RmL1VudXNlZFBhcmFtLmgKaW5kZXggOTk2ZjVjOC4uNzVmNjQyOCAxMDA2NDQKLS0tIGEvSmF2 YVNjcmlwdENvcmUvd3RmL1VudXNlZFBhcmFtLmgKKysrIGIvSmF2YVNjcmlwdENvcmUvd3RmL1Vu dXNlZFBhcmFtLmgKQEAgLTI0LDYgKzI0LDE0IEBACiAvKiBkb24ndCB1c2UgdGhpcyBmb3IgQysr LCBpdCBzaG91bGQgb25seSBiZSB1c2VkIGluIHBsYWluIEMgZmlsZXMgb3IKICAgIE9iakMgbWV0 aG9kcywgd2hlcmUgbGVhdmluZyBvZmYgdGhlIHBhcmFtZXRlciBuYW1lIGlzIG5vdCBhbGxvd2Vk LiAqLwogCi0jZGVmaW5lIFVOVVNFRF9QQVJBTSh4KSAodm9pZCl4CisjaW5jbHVkZSAiUGxhdGZv cm0uaCIKKworI2lmIENPTVBJTEVSKElOVEVMKSAmJiAhT1MoV0lORE9XUykgfHwgQ09NUElMRVIo UlZDVCkKK3RlbXBsYXRlIDx0eXBlbmFtZSBUPgoraW5saW5lIHZvaWQgdW51c2VkUGFyYW0oVCAm eCkgeyAodm9pZCl4OyB9CisjZGVmaW5lIFVOVVNFRF9QQVJBTSh2YXJpYWJsZSkgdW51c2VkUGFy YW0odmFyaWFibGUpCisjZWxzZQorI2RlZmluZSBVTlVTRURfUEFSQU0odmFyaWFibGUpICh2b2lk KXZhcmlhYmxlCisjZW5kaWYKIAogI2VuZGlmIC8qIFdURl9VbnVzZWRQYXJhbV9oICovCg==