Author: Haojian Wu Date: 2020-07-13T12:05:09+02:00 New Revision: 1d3d9c7b589e6471edc0d8a2272c399d2ce6a13c
URL: https://github.com/llvm/llvm-project/commit/1d3d9c7b589e6471edc0d8a2272c399d2ce6a13c DIFF: https://github.com/llvm/llvm-project/commit/1d3d9c7b589e6471edc0d8a2272c399d2ce6a13c.diff LOG: [clang] Include type specifiers in typo correction when checking isCXXDeclarationSpecifiers. - add more tests (the test added in https://github.com/llvm/llvm-project/commit/2f448467e4254ddc3191136c968e6054bc009b88 is weak); - improve the `MyTemplate<type_typo, int>();` case, with this patch, typo correction suggests the type decl, and no regressions found. Differential Revision: https://reviews.llvm.org/D83025 Added: Modified: clang/lib/Parse/ParseTentative.cpp clang/test/Parser/cxx-template-decl.cpp clang/test/SemaCXX/typo-correction.cpp Removed: ################################################################################ diff --git a/clang/lib/Parse/ParseTentative.cpp b/clang/lib/Parse/ParseTentative.cpp index 948162c11b3f..f026f3a1bfb2 100644 --- a/clang/lib/Parse/ParseTentative.cpp +++ b/clang/lib/Parse/ParseTentative.cpp @@ -1110,8 +1110,9 @@ class TentativeParseCCC final : public CorrectionCandidateCallback { public: TentativeParseCCC(const Token &Next) { WantRemainingKeywords = false; - WantTypeSpecifiers = Next.isOneOf(tok::l_paren, tok::r_paren, tok::greater, - tok::l_brace, tok::identifier); + WantTypeSpecifiers = + Next.isOneOf(tok::l_paren, tok::r_paren, tok::greater, tok::l_brace, + tok::identifier, tok::comma); } bool ValidateCandidate(const TypoCorrection &Candidate) override { diff --git a/clang/test/Parser/cxx-template-decl.cpp b/clang/test/Parser/cxx-template-decl.cpp index 24cc13cde91f..64e7ca921f57 100644 --- a/clang/test/Parser/cxx-template-decl.cpp +++ b/clang/test/Parser/cxx-template-decl.cpp @@ -286,17 +286,3 @@ namespace PR45239 { template<int> int b; template<int> auto f() -> b<0>; // expected-error +{{}} } - -namespace NoCrashOnNullNNSTypoCorrection { - -int AddObservation(); // expected-note {{declared here}} - -template <typename T, typename... Args> // expected-note {{template parameter is declared here}} -class UsingImpl {}; -class AddObservation { - using Using = - UsingImpl<AddObservationFn, const int>; // expected-error {{use of undeclared identifier 'AddObservationFn'; did you mean}} \ - expected-error {{template argument for template type parameter must be a type}} -}; - -} diff --git a/clang/test/SemaCXX/typo-correction.cpp b/clang/test/SemaCXX/typo-correction.cpp index 92a145074e72..e0325b3ba09b 100644 --- a/clang/test/SemaCXX/typo-correction.cpp +++ b/clang/test/SemaCXX/typo-correction.cpp @@ -611,6 +611,41 @@ int bar() { } } +namespace testIncludeTypeInTemplateArgument { +template <typename T, typename U> +void foo(T t = {}, U = {}); // expected-note {{candidate template ignored}} + +class AddObservation {}; // expected-note {{declared here}} +int bar1() { + // should resolve to a class. + foo<AddObservationFn, int>(); // expected-error {{unknown type name 'AddObservationFn'; did you mean 'AddObservation'?}} + + // should not resolve to a class. + foo(AddObservationFn, 1); // expected-error-re {{use of undeclared identifier 'AddObservationFn'{{$}}}} + int a = AddObservationFn, b; // expected-error-re {{use of undeclared identifier 'AddObservationFn'{{$}}}} + + int AddObservation; // expected-note 3{{declared here}} + // should resolve to a local variable. + foo(AddObservationFn, 1); // expected-error {{use of undeclared identifier 'AddObservationFn'; did you mean}} + int c = AddObservationFn, d; // expected-error {{use of undeclared identifier 'AddObservationFn'; did you mean}} + + // FIXME: would be nice to not resolve to a variable. + foo<AddObservationFn, int>(); // expected-error {{use of undeclared identifier 'AddObservationFn'; did you mean}} \ + expected-error {{no matching function for call}} +} +} // namespace testIncludeTypeInTemplateArgument + +namespace testNoCrashOnNullNNSTypoCorrection { +int AddObservation(); +template <typename T, typename... Args> +class UsingImpl {}; +class AddObservation { // expected-note {{declared here}} + using Using = + // should resolve to a class. + UsingImpl<AddObservationFn, const int>; // expected-error {{unknown type name 'AddObservationFn'; did you mean}} +}; +} // namespace testNoCrashOnNullNNSTypoCorrection + namespace testNonStaticMemberHandling { struct Foo { bool usesMetadata; // expected-note {{'usesMetadata' declared here}} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
