This is an archive of the discontinued LLVM Phabricator instance.

Differential D95392

Restore GNU , ## __VA_ARGS__ behavior in MSVC mode
ClosedPublic

Authored by hvdijk on Jan 25 2021, 1:49 PM.

Details

Reviewers
rsmith
Commits
rGb43c26d036dc: Restore GNU , ## __VA_ARGS__ behavior in MSVC mode
Summary

As noted in D91913, MSVC implements the GNU behavior for , ## VA_ARGS as well. Do the same when -fms-compatibility is used.

Diff Detail

Event Timeline

hvdijk requested review of this revision.Jan 25 2021, 1:49 PM
hvdijk created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptJan 25 2021, 1:49 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
hvdijk mentioned this in D91913: Suppress non-conforming GNU paste extension in all standard-conforming modes.Jan 25 2021, 1:51 PM
hvdijk retitled this revision from Restore GNU , ## __VA_ARGS__ behavior in MSVC mode too to Restore GNU , ## __VA_ARGS__ behavior in MSVC mode.
dmajor added a subscriber: dmajor.Jan 25 2021, 1:55 PM
rsmith accepted this revision.Jan 25 2021, 2:04 PM
This revision is now accepted and ready to land.Jan 25 2021, 2:04 PM
Harbormaster completed remote builds in B86624: Diff 319103.Jan 25 2021, 2:33 PM
Closed by commit rGb43c26d036dc: Restore GNU , ## __VA_ARGS__ behavior in MSVC mode (authored by hvdijk). · Explain WhyJan 25 2021, 2:35 PM
This revision was automatically updated to reflect the committed changes.
hvdijk added a commit: rGb43c26d036dc: Restore GNU , ## __VA_ARGS__ behavior in MSVC mode.
rnk added a reverting change: rG61a66e4b5ec1: Revert "Suppress non-conforming GNU paste extension in all standard-conforming….Jan 27 2021, 11:09 AM

Revision Contents

PathSize
clang/
lib/
Lex/
3 lines
test/
Preprocessor/
2 lines

Diff 319103

clang/lib/Lex/TokenLexer.cpp

Show First 20 Lines • Show All 146 Lines • ▼ Show 20 Linesbool TokenLexer::MaybeRemoveCommaBeforeVaArgs(
if (!HasPasteOperator && !PP.getLangOpts().MSVCCompat) if (!HasPasteOperator && !PP.getLangOpts().MSVCCompat)
return false; return false;
// GCC removes the comma in the expansion of " ... , ## __VA_ARGS__ " if // GCC removes the comma in the expansion of " ... , ## __VA_ARGS__ " if
// __VA_ARGS__ is empty, but not in strict mode where there are no // __VA_ARGS__ is empty, but not in strict mode where there are no
// named arguments, where it remains. With GNU extensions, it is removed // named arguments, where it remains. With GNU extensions, it is removed
// regardless of named arguments. // regardless of named arguments.
// Microsoft also appears to support this extension, unofficially. // Microsoft also appears to support this extension, unofficially.
if (!PP.getLangOpts().GNUMode && Macro->getNumParams() < 2) if (!PP.getLangOpts().GNUMode && !PP.getLangOpts().MSVCCompat &&
Macro->getNumParams() < 2)
return false; return false;
// Is a comma available to be removed? // Is a comma available to be removed?
if (ResultToks.empty() || !ResultToks.back().is(tok::comma)) if (ResultToks.empty() || !ResultToks.back().is(tok::comma))
return false; return false;
// Issue an extension diagnostic for the paste operator. // Issue an extension diagnostic for the paste operator.
if (HasPasteOperator) if (HasPasteOperator)
▲ Show 20 Lines • Show All 915 Lines • Show Last 20 Lines

clang/test/Preprocessor/macro_fn_comma_swallow2.c

// Test the __VA_ARGS__ comma swallowing extensions of various compiler dialects. // Test the __VA_ARGS__ comma swallowing extensions of various compiler dialects.
// RUN: %clang_cc1 -E %s | FileCheck -check-prefix=GCC -strict-whitespace %s // RUN: %clang_cc1 -E %s | FileCheck -check-prefix=GCC -strict-whitespace %s
// RUN: %clang_cc1 -E -std=c90 %s | FileCheck -check-prefix=C99 -strict-whitespace %s // RUN: %clang_cc1 -E -std=c90 %s | FileCheck -check-prefix=C99 -strict-whitespace %s
// RUN: %clang_cc1 -E -std=c99 %s | FileCheck -check-prefix=C99 -strict-whitespace %s // RUN: %clang_cc1 -E -std=c99 %s | FileCheck -check-prefix=C99 -strict-whitespace %s
// RUN: %clang_cc1 -E -std=c11 %s | FileCheck -check-prefix=C99 -strict-whitespace %s // RUN: %clang_cc1 -E -std=c11 %s | FileCheck -check-prefix=C99 -strict-whitespace %s
// RUN: %clang_cc1 -E -x c++ %s | FileCheck -check-prefix=GCC -strict-whitespace %s // RUN: %clang_cc1 -E -x c++ %s | FileCheck -check-prefix=GCC -strict-whitespace %s
// RUN: %clang_cc1 -E -x c++ -std=c++03 %s | FileCheck -check-prefix=C99 -strict-whitespace %s // RUN: %clang_cc1 -E -x c++ -std=c++03 %s | FileCheck -check-prefix=C99 -strict-whitespace %s
// RUN: %clang_cc1 -E -x c++ -std=c++11 %s | FileCheck -check-prefix=C99 -strict-whitespace %s // RUN: %clang_cc1 -E -x c++ -std=c++11 %s | FileCheck -check-prefix=C99 -strict-whitespace %s
// RUN: %clang_cc1 -E -std=gnu99 %s | FileCheck -check-prefix=GCC -strict-whitespace %s // RUN: %clang_cc1 -E -std=gnu99 %s | FileCheck -check-prefix=GCC -strict-whitespace %s
// RUN: %clang_cc1 -E -fms-compatibility %s | FileCheck -check-prefix=MS -strict-whitespace %s // RUN: %clang_cc1 -E -fms-compatibility %s | FileCheck -check-prefix=MS -strict-whitespace %s
// RUN: %clang_cc1 -E -x c++ -fms-compatibility %s | FileCheck -check-prefix=MS -strict-whitespace %s
// RUN: %clang_cc1 -E -x c++ -std=c++11 -fms-compatibility %s | FileCheck -check-prefix=MS -strict-whitespace %s
// RUN: %clang_cc1 -E -DNAMED %s | FileCheck -check-prefix=GCC -strict-whitespace %s // RUN: %clang_cc1 -E -DNAMED %s | FileCheck -check-prefix=GCC -strict-whitespace %s
// RUN: %clang_cc1 -E -std=c99 -DNAMED %s | FileCheck -check-prefix=C99 -strict-whitespace %s // RUN: %clang_cc1 -E -std=c99 -DNAMED %s | FileCheck -check-prefix=C99 -strict-whitespace %s
#ifndef NAMED #ifndef NAMED
# define A(...) [ __VA_ARGS__ ] # define A(...) [ __VA_ARGS__ ]
# define B(...) [ , __VA_ARGS__ ] # define B(...) [ , __VA_ARGS__ ]
# define C(...) [ , ## __VA_ARGS__ ] # define C(...) [ , ## __VA_ARGS__ ]
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines