Author: rnk Date: Mon Feb 25 18:22:17 2019 New Revision: 354838 URL: http://llvm.org/viewvc/llvm-project?rev=354838&view=rev Log: [MS] Fix for Bug 8446, template instantiation without a 'typename' keyword
Patch by Zahira Ammarguellat! Differential Revision: https://reviews.llvm.org/D41950 Added: cfe/trunk/test/SemaTemplate/missing-typename.cpp Modified: cfe/trunk/lib/Parse/ParseTentative.cpp Modified: cfe/trunk/lib/Parse/ParseTentative.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseTentative.cpp?rev=354838&r1=354837&r2=354838&view=diff ============================================================================== --- cfe/trunk/lib/Parse/ParseTentative.cpp (original) +++ cfe/trunk/lib/Parse/ParseTentative.cpp Mon Feb 25 18:22:17 2019 @@ -1498,6 +1498,17 @@ Parser::isCXXDeclarationSpecifier(Parser // expression. *HasMissingTypename = true; return TPResult::Ambiguous; + } else { + // In MS mode, if HasMissingTypename is not provided, and the tokens + // are or the form *) or &) *> or &> &&>, this can't be an expression. + // The typename must be missing. + if (getLangOpts().MSVCCompat) { + if (((Tok.is(tok::amp) || Tok.is(tok::star)) && + (NextToken().is(tok::r_paren) || + NextToken().is(tok::greater))) || + (Tok.is(tok::ampamp) && NextToken().is(tok::greater))) + return TPResult::True; + } } } else { // Try to resolve the name. If it doesn't exist, assume it was Added: cfe/trunk/test/SemaTemplate/missing-typename.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/missing-typename.cpp?rev=354838&view=auto ============================================================================== --- cfe/trunk/test/SemaTemplate/missing-typename.cpp (added) +++ cfe/trunk/test/SemaTemplate/missing-typename.cpp Mon Feb 25 18:22:17 2019 @@ -0,0 +1,102 @@ +// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s -Wno-unused +// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s -Wno-unused -fms-compatibility -DMSVC + +namespace PR8446_1 { +struct A { + typedef int BASE_VALUE; +}; + +void g(int &y) {} + +template <typename BASE_CLASS> +void f(int &rValue) { +#if MSVC +// expected-warning@+4 {{missing 'typename' prior to dependent type name 'BASE_CLASS::BASE_VALUE'}} +#else + // expected-error@+2 {{expected expression}} +#endif + return g((BASE_CLASS::BASE_VALUE &)rValue); +} + +int main() { + int x; + f<A>(x); + return 0; +} +} // namespace PR8446_1 + + +namespace PR8446_2 { +struct site_symmetry_ops {}; + +template <class wt> +struct class_ { + template <class A1> + void def(A1 const &a1) {} +}; + +template <class A1, class A2> +struct init { + init() {} +}; + +struct special_position_site_parameter { + typedef char scatterer_type; +}; + +template <class wt> +struct valued_asu_parameter_heir_wrapper { + static class_<wt> wrap(char const *name) { + return class_<wt>(); + } +}; + +template <class wt> +struct special_position_wrapper { + static void wrap(char const *name) { + valued_asu_parameter_heir_wrapper<wt>::wrap(name) +#if MSVC + // expected-warning@+4 {{missing 'typename' prior to dependent type name 'wt::scatterer_type'}} +#else + // expected-error@+2 {{expected expression}} +#endif + .def(init<site_symmetry_ops const &, wt::scatterer_type *>()); + } +}; + +void wrap_special_position() { + special_position_wrapper<special_position_site_parameter>::wrap("special_position_site_parameter"); +} +} // namespace PR8446_2 + +namespace PR8446_3 { +int g(int); +template <typename T> +int f1(int x) { + return g((T::InnerName & x) & x); +} + +template <typename T> +int f2(int x) { + return g((T::InnerName & 3) & x); +} + +template <typename T> +int f3(int x) { + return g((T::InnerName & (3))); +} + +template <typename T> +int f4(int x) { + return g((T::InnerName * 3) & x); +} +struct A { + static const int InnerName = 42; +}; +int main() { + f1<A>(0); + f2<A>(0); + f3<A>(0); + return f4<A>(0); +} +} // namespace PR8446_3 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
