Author: Aaron Ballman Date: 2025-03-07T08:34:22-05:00 New Revision: 9fc3310798be5afd265ff6ad7274c0d02487f5df
URL: https://github.com/llvm/llvm-project/commit/9fc3310798be5afd265ff6ad7274c0d02487f5df DIFF: https://github.com/llvm/llvm-project/commit/9fc3310798be5afd265ff6ad7274c0d02487f5df.diff LOG: [C2y] Implement WG14 N3411 (#130180) This paper (https://www.open-std.org/jtc1/sc22/wg14/www/docs/n3411.pdf) allows a source file to end without a newline. Clang has supported this as a conforming extension for a long time, so this suppresses the diagnotic in C2y mode but continues to diagnose as an extension in earlier language modes. It also continues to diagnose if the user passes -Wnewline-eof explicitly. Added: clang/test/C/C2y/n3411.c Modified: clang/docs/ReleaseNotes.rst clang/lib/Lex/Lexer.cpp clang/www/c_status.html Removed: ################################################################################ diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index a25808e36bd51..577b3f2130df7 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -111,6 +111,9 @@ C Language Changes C2y Feature Support ^^^^^^^^^^^^^^^^^^^ +- Implemented N3411 which allows a source file to not end with a newline + character. This is still reported as a conforming extension in earlier + language modes. C23 Feature Support ^^^^^^^^^^^^^^^^^^^ diff --git a/clang/lib/Lex/Lexer.cpp b/clang/lib/Lex/Lexer.cpp index 087c6f13aea66..c62a9f5041183 100644 --- a/clang/lib/Lex/Lexer.cpp +++ b/clang/lib/Lex/Lexer.cpp @@ -3192,23 +3192,22 @@ bool Lexer::LexEndOfFile(Token &Result, const char *CurPtr) { if (CurPtr != BufferStart && (CurPtr[-1] != '\n' && CurPtr[-1] != '\r')) { DiagnosticsEngine &Diags = PP->getDiagnostics(); SourceLocation EndLoc = getSourceLocation(BufferEnd); - unsigned DiagID; + unsigned DiagID = diag::warn_no_newline_eof; if (LangOpts.CPlusPlus11) { // C++11 [lex.phases] 2.2 p2 // Prefer the C++98 pedantic compatibility warning over the generic, // non-extension, user-requested "missing newline at EOF" warning. - if (!Diags.isIgnored(diag::warn_cxx98_compat_no_newline_eof, EndLoc)) { + if (!Diags.isIgnored(diag::warn_cxx98_compat_no_newline_eof, EndLoc)) DiagID = diag::warn_cxx98_compat_no_newline_eof; - } else { - DiagID = diag::warn_no_newline_eof; - } } else { - DiagID = diag::ext_no_newline_eof; + // This is conforming in C2y, but is an extension in earlier language + // modes. + if (!LangOpts.C2y) + DiagID = diag::ext_no_newline_eof; } - Diag(BufferEnd, DiagID) - << FixItHint::CreateInsertion(EndLoc, "\n"); + Diag(BufferEnd, DiagID) << FixItHint::CreateInsertion(EndLoc, "\n"); } BufferPtr = CurPtr; diff --git a/clang/test/C/C2y/n3411.c b/clang/test/C/C2y/n3411.c new file mode 100644 index 0000000000000..934a7c70fa67e --- /dev/null +++ b/clang/test/C/C2y/n3411.c @@ -0,0 +1,15 @@ +// RUN: %clang_cc1 -verify=good -std=c2y -Wall -pedantic %s +// RUN: %clang_cc1 -verify -Wnewline-eof -std=c2y -Wall -pedantic %s +// RUN: %clang_cc1 -verify -std=c23 -Wall -pedantic %s +// RUN: %clang_cc1 -verify=good -std=c23 %s + +/* WG14 N3411: Yes + * Slay Some Earthly Demons XII + * + * Allow a non-empty source file to end without a final newline character. Note + * that this file intentionally does not end with a trailing newline. + */ +// good-no-diagnostics + +int x; // Ensure the file contains at least one declaration. +// expected-warning {{no newline at end of file}} \ No newline at end of file diff --git a/clang/www/c_status.html b/clang/www/c_status.html index 2f8b063f77b5d..51b11f4d54920 100644 --- a/clang/www/c_status.html +++ b/clang/www/c_status.html @@ -294,7 +294,7 @@ <h2 id="c2y">C2y implementation status</h2> <tr> <td>Slay Some Earthly Demons XII</td> <td><a href="https://www.open-std.org/jtc1/sc22/wg14/www/docs/n3411.pdf";>N3411</a></td> - <td class="unknown" align="center">Unknown</td> + <td class="unreleased" align="center">Clang 21</td> </tr> <tr> <td>Slay Some Earthly Demons XIII</td> _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
