r277134 - [GCC] Support for __final specifier
Andrey Bokhanko via cfe-commits
cfe-commits at lists.llvm.org
Fri Jul 29 11:56:50 PDT 2016
Mike,
Thanks for letting me know.
I committed a patch authored by Erich (CCed); Erich, could you, please,
investigate?
Yours,
Andrey
On Fri, Jul 29, 2016 at 9:35 PM, Mike Aizatsky <aizatsky at google.com> wrote:
> Andrey,
>
> This change breaks the bot:
>
> http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fast/builds/15093
>
> ==15371==WARNING: MemorySanitizer: use-of-uninitialized-value
> #0 0x733784d in clang::Parser::ParseOptionalCXX11VirtSpecifierSeq(clang::VirtSpecifiers&, bool, clang::SourceLocation) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp:2050:9
> #1 0x7337d55 in clang::Parser::ParseCXXMemberDeclaratorBeforeInitializer(clang::Declarator&, clang::VirtSpecifiers&, clang::ActionResult<clang::Expr*, true>&, clang::Parser::LateParsedAttrList&) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp:2119:5
> #2 0x733d2b9 in clang::Parser::ParseCXXClassMemberDeclaration(clang::AccessSpecifier, clang::AttributeList*, clang::Parser::ParsedTemplateInfo const&, clang::ParsingDeclRAIIObject*) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp:2475:7
> #3 0x73441a7 in clang::Parser::ParseCXXClassMemberDeclarationWithPragmas(clang::AccessSpecifier&, clang::Parser::ParsedAttributesWithRange&, clang::TypeSpecifierType, clang::Decl*) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp:2943:10
> #4 0x733264c in clang::Parser::ParseCXXMemberSpecification(clang::SourceLocation, clang::SourceLocation, clang::Parser::ParsedAttributesWithRange&, unsigned int, clang::Decl*) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp:3113:7
> #5 0x732b9c4 in clang::Parser::ParseClassSpecifier(clang::tok::TokenKind, clang::SourceLocation, clang::DeclSpec&, clang::Parser::ParsedTemplateInfo const&, clang::AccessSpecifier, bool, clang::Parser::DeclSpecContext, clang::Parser::ParsedAttributesWithRange&) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp:1775:7
> #6 0x72cb42c in clang::Parser::ParseDeclarationSpecifiers(clang::DeclSpec&, clang::Parser::ParsedTemplateInfo const&, clang::AccessSpecifier, clang::Parser::DeclSpecContext, clang::Parser::LateParsedAttrList*) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/ParseDecl.cpp:3413:7
> #7 0x7474138 in clang::Parser::ParseSingleDeclarationAfterTemplate(unsigned int, clang::Parser::ParsedTemplateInfo const&, clang::ParsingDeclRAIIObject&, clang::SourceLocation&, clang::AccessSpecifier, clang::AttributeList*) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/ParseTemplate.cpp:207:3
> #8 0x7472b4d in clang::Parser::ParseTemplateDeclarationOrSpecialization(unsigned int, clang::SourceLocation&, clang::AccessSpecifier, clang::AttributeList*) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/ParseTemplate.cpp:152:10
> #9 0x747159a in clang::Parser::ParseDeclarationStartingWithTemplate(unsigned int, clang::SourceLocation&, clang::AccessSpecifier, clang::AttributeList*) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/ParseTemplate.cpp:38:10
> #10 0x72c86ed in clang::Parser::ParseDeclaration(unsigned int, clang::SourceLocation&, clang::Parser::ParsedAttributesWithRange&) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/ParseDecl.cpp:1492:18
> #11 0x72819fd in clang::Parser::ParseExternalDeclaration(clang::Parser::ParsedAttributesWithRange&, clang::ParsingDeclSpec*) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/Parser.cpp:749:14
> #12 0x7318897 in clang::Parser::ParseInnerNamespace(std::__1::vector<clang::SourceLocation, std::__1::allocator<clang::SourceLocation> >&, std::__1::vector<clang::IdentifierInfo*, std::__1::allocator<clang::IdentifierInfo*> >&, std::__1::vector<clang::SourceLocation, std::__1::allocator<clang::SourceLocation> >&, unsigned int, clang::SourceLocation&, clang::ParsedAttributes&, clang::BalancedDelimiterTracker&) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp:221:7
> #13 0x731722e in clang::Parser::ParseNamespace(unsigned int, clang::SourceLocation&, clang::SourceLocation) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp:195:3
> #14 0x72c8955 in clang::Parser::ParseDeclaration(unsigned int, clang::SourceLocation&, clang::Parser::ParsedAttributesWithRange&) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/ParseDecl.cpp:1505:12
> #15 0x72819fd in clang::Parser::ParseExternalDeclaration(clang::Parser::ParsedAttributesWithRange&, clang::ParsingDeclSpec*) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/Parser.cpp:749:14
> #16 0x7281027 in clang::Parser::ParseTopLevelDecl(clang::OpaquePtr<clang::DeclGroupRef>&) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/Parser.cpp:594:12
> #17 0x7272931 in clang::ParseAST(clang::Sema&, bool, bool) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/ParseAST.cpp:160:17
> #18 0x59e5c47 in clang::FrontendAction::Execute() /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Frontend/FrontendAction.cpp:458:8 #19 0x593dfcb in clang::CompilerInstance::ExecuteAction(clang::FrontendAction&) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Frontend/CompilerInstance.cpp:868:11
> #20 0x5bfcc50 in clang::ExecuteCompilerInvocation(clang::CompilerInstance*) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp:241:25
> #21 0x8a0d65 in cc1_main(llvm::ArrayRef<char const*>, char const*, void*) /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/tools/driver/cc1_main.cpp:116:13
> #22 0x89ba9a in ExecuteCC1Tool /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/tools/driver/driver.cpp:299:12
> #23 0x89ba9a in main /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/tools/driver/driver.cpp:380
> #24 0x7f7d81406f44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21f44)
> #25 0x80dded in _start (/mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm_build_msan/bin/clang-3.9+0x80dded)
>
> SUMMARY: MemorySanitizer: use-of-uninitialized-value /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp:2050:9 in clang::Parser::ParseOptionalCXX11VirtSpecifierSeq(clang::VirtSpecifiers&, bool, clang::SourceLocation)
> Exiting
>
>
>
>
> On Fri, Jul 29, 2016 at 3:50 AM Andrey Bokhanko via cfe-commits <
> cfe-commits at lists.llvm.org> wrote:
>
>> 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 at lists.llvm.org
>> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>>
> --
> Mike
> Sent from phone
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20160729/76db6187/attachment-0001.html>
More information about the cfe-commits
mailing list