llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: None (yicuixi) <details> <summary>Changes</summary> Fixes https://github.com/llvm/llvm-project/issues/114402. --- Full diff: https://github.com/llvm/llvm-project/pull/159981.diff 3 Files Affected: - (modified) clang/docs/ReleaseNotes.rst (+1) - (modified) clang/lib/Parse/ParseDecl.cpp (+2-1) - (added) clang/test/Parser/ms-empty-enum.c (+8) ``````````diff diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index 46d56bb3f07f5..c4b5e15b2b4f9 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -366,6 +366,7 @@ Bug Fixes in This Version - Fixed an assertion when an improper use of the ``malloc`` attribute targeting a function without arguments caused us to try to access a non-existent argument. (#GH159080) +- Accept empty enum in MSVC-compatible C. (#GH114402) Bug Fixes to Compiler Builtins ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp index 22c01c4e371f3..17e29b3efc348 100644 --- a/clang/lib/Parse/ParseDecl.cpp +++ b/clang/lib/Parse/ParseDecl.cpp @@ -5360,7 +5360,8 @@ void Parser::ParseEnumBody(SourceLocation StartLoc, Decl *EnumDecl, T.consumeOpen(); // C does not allow an empty enumerator-list, C++ does [dcl.enum]. - if (Tok.is(tok::r_brace) && !getLangOpts().CPlusPlus) + if (Tok.is(tok::r_brace) && !getLangOpts().CPlusPlus && + !getLangOpts().MSVCCompat && !getLangOpts().MicrosoftExt) Diag(Tok, diag::err_empty_enum); SmallVector<Decl *, 32> EnumConstantDecls; diff --git a/clang/test/Parser/ms-empty-enum.c b/clang/test/Parser/ms-empty-enum.c new file mode 100644 index 0000000000000..37e34d7c154bf --- /dev/null +++ b/clang/test/Parser/ms-empty-enum.c @@ -0,0 +1,8 @@ +// RUN: %clang_cc1 %s -fsyntax-only -Wmicrosoft -verify -fms-extensions +// RUN: %clang_cc1 %s -fsyntax-only -Wmicrosoft -verify -fms-compatibility +// expected-no-diagnostics + +typedef enum tag1 { } A; +typedef enum tag2 { } B; +typedef enum : unsigned { } C; + `````````` </details> https://github.com/llvm/llvm-project/pull/159981 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
