Author: asbokhan Date: Fri Jul 29 05:42:48 2016 New Revision: 277134 URL: http://llvm.org/viewvc/llvm-project?rev=277134&view=rev Log: [GCC] Support for __final specifier
As reported in bug 28473, GCC supports "final" functionality in pre-C++11 code using the __final keyword. Clang currently supports the "final" keyword in accordance with the C++11 specification, however it ALSO supports it in pre-C++11 mode, with a warning. This patch adds the "__final" keyword for compatibility with GCC in GCC Keywords mode (so it is enabled with existing flags), and issues a warning on its usage (suggesting switching to the C++11 keyword). This patch also adds a regression test for the functionality described. I believe this patch has minimal impact, as it simply adds a new keyword for existing behavior. This has been validated with check-clang to avoid regressions. Patch is created in reference to revisions 276665. Patch by Erich Keane. Differential Revision: https://reviews.llvm.org/D22919 Added: cfe/trunk/test/Parser/gcc-__final-compatibility.cpp Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td cfe/trunk/include/clang/Parse/Parser.h cfe/trunk/include/clang/Sema/DeclSpec.h cfe/trunk/lib/Parse/ParseDeclCXX.cpp cfe/trunk/lib/Sema/DeclSpec.cpp Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=277134&r1=277133&r2=277134&view=diff ============================================================================== --- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original) +++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Fri Jul 29 05:42:48 2016 @@ -8652,4 +8652,8 @@ def warn_block_literal_qualifiers_on_omi "'%0' qualifier on omitted return type %1 has no effect">, InGroup<IgnoredQualifiers>; +def ext_warn_gnu_final : ExtWarn< + "__final is a GNU extension, consider using C++11 final">, + InGroup<GccCompat>; + } // end of sema component. Modified: cfe/trunk/include/clang/Parse/Parser.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/Parser.h?rev=277134&r1=277133&r2=277134&view=diff ============================================================================== --- cfe/trunk/include/clang/Parse/Parser.h (original) +++ cfe/trunk/include/clang/Parse/Parser.h Fri Jul 29 05:42:48 2016 @@ -143,6 +143,7 @@ class Parser : public CodeCompletionHand /// C++0x contextual keywords. mutable IdentifierInfo *Ident_final; + mutable IdentifierInfo *Ident_GNU_final; mutable IdentifierInfo *Ident_override; // C++ type trait keywords that can be reverted to identifiers and still be Modified: cfe/trunk/include/clang/Sema/DeclSpec.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/DeclSpec.h?rev=277134&r1=277133&r2=277134&view=diff ============================================================================== --- cfe/trunk/include/clang/Sema/DeclSpec.h (original) +++ cfe/trunk/include/clang/Sema/DeclSpec.h Fri Jul 29 05:42:48 2016 @@ -2399,7 +2399,9 @@ public: VS_None = 0, VS_Override = 1, VS_Final = 2, - VS_Sealed = 4 + VS_Sealed = 4, + // Represents the __final keyword, which is legal for gcc in pre-C++11 mode. + VS_GNU_Final = 8 }; VirtSpecifiers() : Specifiers(0), LastSpecifier(VS_None) { } @@ -2412,7 +2414,7 @@ public: bool isOverrideSpecified() const { return Specifiers & VS_Override; } SourceLocation getOverrideLoc() const { return VS_overrideLoc; } - bool isFinalSpecified() const { return Specifiers & (VS_Final | VS_Sealed); } + bool isFinalSpecified() const { return Specifiers & (VS_Final | VS_Sealed | VS_GNU_Final); } bool isFinalSpelledSealed() const { return Specifiers & VS_Sealed; } SourceLocation getFinalLoc() const { return VS_finalLoc; } Modified: cfe/trunk/lib/Parse/ParseDeclCXX.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseDeclCXX.cpp?rev=277134&r1=277133&r2=277134&view=diff ============================================================================== --- cfe/trunk/lib/Parse/ParseDeclCXX.cpp (original) +++ cfe/trunk/lib/Parse/ParseDeclCXX.cpp Fri Jul 29 05:42:48 2016 @@ -2005,6 +2005,7 @@ void Parser::HandleMemberFunctionDeclDel /// virt-specifier: /// override /// final +/// __final VirtSpecifiers::Specifier Parser::isCXX11VirtSpecifier(const Token &Tok) const { if (!getLangOpts().CPlusPlus || Tok.isNot(tok::identifier)) return VirtSpecifiers::VS_None; @@ -2014,6 +2015,8 @@ VirtSpecifiers::Specifier Parser::isCXX1 // Initialize the contextual keywords. if (!Ident_final) { Ident_final = &PP.getIdentifierTable().get("final"); + if (getLangOpts().GNUKeywords) + Ident_GNU_final = &PP.getIdentifierTable().get("__final"); if (getLangOpts().MicrosoftExt) Ident_sealed = &PP.getIdentifierTable().get("sealed"); Ident_override = &PP.getIdentifierTable().get("override"); @@ -2028,6 +2031,9 @@ VirtSpecifiers::Specifier Parser::isCXX1 if (II == Ident_final) return VirtSpecifiers::VS_Final; + if (II == Ident_GNU_final) + return VirtSpecifiers::VS_GNU_Final; + return VirtSpecifiers::VS_None; } @@ -2067,6 +2073,8 @@ void Parser::ParseOptionalCXX11VirtSpeci << VirtSpecifiers::getSpecifierName(Specifier); } else if (Specifier == VirtSpecifiers::VS_Sealed) { Diag(Tok.getLocation(), diag::ext_ms_sealed_keyword); + } else if (Specifier == VirtSpecifiers::VS_GNU_Final) { + Diag(Tok.getLocation(), diag::ext_warn_gnu_final); } else { Diag(Tok.getLocation(), getLangOpts().CPlusPlus11 @@ -2083,6 +2091,7 @@ void Parser::ParseOptionalCXX11VirtSpeci bool Parser::isCXX11FinalKeyword() const { VirtSpecifiers::Specifier Specifier = isCXX11VirtSpecifier(); return Specifier == VirtSpecifiers::VS_Final || + Specifier == VirtSpecifiers::VS_GNU_Final || Specifier == VirtSpecifiers::VS_Sealed; } @@ -2996,6 +3005,7 @@ void Parser::ParseCXXMemberSpecification if (getLangOpts().CPlusPlus && Tok.is(tok::identifier)) { VirtSpecifiers::Specifier Specifier = isCXX11VirtSpecifier(Tok); assert((Specifier == VirtSpecifiers::VS_Final || + Specifier == VirtSpecifiers::VS_GNU_Final || Specifier == VirtSpecifiers::VS_Sealed) && "not a class definition"); FinalLoc = ConsumeToken(); @@ -3011,6 +3021,8 @@ void Parser::ParseCXXMemberSpecification << VirtSpecifiers::getSpecifierName(Specifier); else if (Specifier == VirtSpecifiers::VS_Sealed) Diag(FinalLoc, diag::ext_ms_sealed_keyword); + else if (Specifier == VirtSpecifiers::VS_GNU_Final) + Diag(FinalLoc, diag::ext_warn_gnu_final); // Parse any C++11 attributes after 'final' keyword. // These attributes are not allowed to appear here, Modified: cfe/trunk/lib/Sema/DeclSpec.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/DeclSpec.cpp?rev=277134&r1=277133&r2=277134&view=diff ============================================================================== --- cfe/trunk/lib/Sema/DeclSpec.cpp (original) +++ cfe/trunk/lib/Sema/DeclSpec.cpp Fri Jul 29 05:42:48 2016 @@ -1299,6 +1299,7 @@ bool VirtSpecifiers::SetSpecifier(Specif switch (VS) { default: llvm_unreachable("Unknown specifier!"); case VS_Override: VS_overrideLoc = Loc; break; + case VS_GNU_Final: case VS_Sealed: case VS_Final: VS_finalLoc = Loc; break; } @@ -1311,6 +1312,7 @@ const char *VirtSpecifiers::getSpecifier default: llvm_unreachable("Unknown specifier"); case VS_Override: return "override"; case VS_Final: return "final"; + case VS_GNU_Final: return "__final"; case VS_Sealed: return "sealed"; } } Added: cfe/trunk/test/Parser/gcc-__final-compatibility.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/gcc-__final-compatibility.cpp?rev=277134&view=auto ============================================================================== --- cfe/trunk/test/Parser/gcc-__final-compatibility.cpp (added) +++ cfe/trunk/test/Parser/gcc-__final-compatibility.cpp Fri Jul 29 05:42:48 2016 @@ -0,0 +1,9 @@ +// RUN: %clang_cc1 -std=c++98 -fgnu-keywords -fsyntax-only -verify %s +// RUN: %clang_cc1 -std=c++11 -fgnu-keywords -fsyntax-only -verify %s + +struct B { + virtual void g(); +}; +struct D __final : B { // expected-warning {{__final is a GNU extension, consider using C++11 final}} + virtual void g() __final; // expected-warning {{__final is a GNU extension, consider using C++11 final}} +}; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
