Author: d0k
Date: Tue Jul 17 06:17:01 2018
New Revision: 337278
URL: http://llvm.org/viewvc/llvm-project?rev=337278&view=rev
Log:
Revert "[Sema] Reword warning for constant captures that are not required"
This reverts commit r337152. This applies to non-constants too. The real
explanation is that the capture is not ODR-used, but putting that into
the warning message seems ... worse.
Modified:
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
cfe/trunk/test/SemaCXX/warn-unused-lambda-capture.cpp
Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=337278&r1=337277&r2=337278&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Tue Jul 17 06:17:01
2018
@@ -341,8 +341,8 @@ def warn_unneeded_member_function : Warn
InGroup<UnneededMemberFunction>, DefaultIgnore;
def warn_unused_private_field: Warning<"private field %0 is not used">,
InGroup<UnusedPrivateField>, DefaultIgnore;
-def warn_unused_lambda_capture: Warning<"lambda capture "
- "%select{|of constant }1%0 is not %select{used|required for this use}1">,
+def warn_unused_lambda_capture: Warning<"lambda capture %0 is not "
+ "%select{used|required to be captured for this use}1">,
InGroup<UnusedLambdaCapture>, DefaultIgnore;
def warn_parameter_size: Warning<
Modified: cfe/trunk/test/SemaCXX/warn-unused-lambda-capture.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-unused-lambda-capture.cpp?rev=337278&r1=337277&r2=337278&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/warn-unused-lambda-capture.cpp (original)
+++ cfe/trunk/test/SemaCXX/warn-unused-lambda-capture.cpp Tue Jul 17 06:17:01
2018
@@ -41,9 +41,9 @@ void test() {
auto explicit_by_value_used = [i] { return i + 1; };
auto explicit_by_value_used_void = [i] { (void)i; };
auto explicit_by_value_unused = [i] {}; // expected-warning{{lambda capture
'i' is not used}}
- auto explicit_by_value_unused_sizeof = [i] { return sizeof(i); }; //
expected-warning{{lambda capture of constant 'i' is not required for this use}}
- auto explicit_by_value_unused_decltype = [i] { decltype(i) j = 0; }; //
expected-warning{{lambda capture of constant 'i' is not required for this use}}
- auto explicit_by_value_unused_const = [k] { return k + 1; }; //
expected-warning{{lambda capture of constant 'k' is not required for this use}}
+ auto explicit_by_value_unused_sizeof = [i] { return sizeof(i); }; //
expected-warning{{lambda capture 'i' is not required to be captured for this
use}}
+ auto explicit_by_value_unused_decltype = [i] { decltype(i) j = 0; }; //
expected-warning{{lambda capture 'i' is not required to be captured for this
use}}
+ auto explicit_by_value_unused_const = [k] { return k + 1; }; //
expected-warning{{lambda capture 'k' is not required to be captured for this
use}}
auto explicit_by_reference_used = [&i] { i++; };
auto explicit_by_reference_unused = [&i] {}; // expected-warning{{lambda
capture 'i' is not used}}
@@ -146,10 +146,10 @@ void test_templated() {
auto explicit_by_value_used_void = [i] { (void)i; };
auto explicit_by_value_unused = [i] {}; // expected-warning{{lambda capture
'i' is not used}}
- auto explicit_by_value_unused_sizeof = [i] { return sizeof(i); }; //
expected-warning{{lambda capture of constant 'i' is not required for this use}}
+ auto explicit_by_value_unused_sizeof = [i] { return sizeof(i); }; //
expected-warning{{lambda capture 'i' is not required to be captured for this
use}}
auto explicit_by_value_unused_decltype = [i] { decltype(i) j = 0; }; //
expected-warning{{lambda capture 'i' is not used}}
- auto explicit_by_value_unused_const = [k] { return k + 1; }; //
expected-warning{{lambda capture of constant 'k' is not required for this use}}
- auto explicit_by_value_unused_const_generic = [k](auto c) { return k + 1; };
// expected-warning{{lambda capture of constant 'k' is not required for this
use}}
+ auto explicit_by_value_unused_const = [k] { return k + 1; }; //
expected-warning{{lambda capture 'k' is not required to be captured for this
use}}
+ auto explicit_by_value_unused_const_generic = [k](auto c) { return k + 1; };
// expected-warning{{lambda capture 'k' is not required to be captured for this
use}}
auto explicit_by_reference_used = [&i] { i++; };
auto explicit_by_reference_unused = [&i] {}; // expected-warning{{lambda
capture 'i' is not used}}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
