Allow #pragma float_control(push|pop) within a language linkage specification

Currently, we prohibit this pragma from appearing within a language
linkage specification, but this is useful functionality that is
supported by MSVC (which is where we inherited this feature from).
This patch allows you to use the pragma within an extern "C" {} (etc)
block.
This commit is contained in:
Aaron Ballman 2021-07-28 07:37:56 -04:00
parent ca0d244e99
commit b0ef3d8f66
4 changed files with 38 additions and 13 deletions

View File

@ -3544,12 +3544,14 @@ A ``#pragma clang fp`` pragma may contain any number of options:
The ``#pragma float_control`` pragma allows precise floating-point
semantics and floating-point exception behavior to be specified
for a section of the source code. This pragma can only appear at file scope or
at the start of a compound statement (excluding comments). When using within a
compound statement, the pragma is active within the scope of the compound
statement. This pragma is modeled after a Microsoft pragma with the
same spelling and syntax. For pragmas specified at file scope, a stack
is supported so that the ``pragma float_control`` settings can be pushed or popped.
for a section of the source code. This pragma can only appear at file or
namespace scope, within a language linkage specification or at the start of a
compound statement (excluding comments). When used within a compound statement,
the pragma is active within the scope of the compound statement. This pragma
is modeled after a Microsoft pragma with the same spelling and syntax. For
pragmas specified at file or namespace scope, or within a language linkage
specification, a stack is supported so that the ``pragma float_control``
settings can be pushed or popped.
When ``pragma float_control(precise, on)`` is enabled, the section of code
governed by the pragma uses precise floating point semantics, effectively

View File

@ -933,7 +933,8 @@ def warn_pragma_pack_pop_identifier_and_alignment : Warning<
def warn_pragma_pop_failed : Warning<"#pragma %0(pop, ...) failed: %1">,
InGroup<IgnoredPragmas>;
def err_pragma_fc_pp_scope : Error<
"'#pragma float_control push/pop' can only appear at file scope or namespace scope">;
"'#pragma float_control push/pop' can only appear at file or namespace scope "
"or within a language linkage specification">;
def err_pragma_fc_noprecise_requires_nofenv : Error<
"'#pragma float_control(precise, off)' is illegal when fenv_access is enabled">;
def err_pragma_fc_except_requires_precise : Error<

View File

@ -475,8 +475,10 @@ void Sema::ActOnPragmaFloatControl(SourceLocation Loc,
PragmaFloatControlKind Value) {
FPOptionsOverride NewFPFeatures = CurFPFeatureOverrides();
if ((Action == PSK_Push_Set || Action == PSK_Push || Action == PSK_Pop) &&
!(CurContext->isTranslationUnit()) && !CurContext->isNamespace()) {
// Push and pop can only occur at file or namespace scope.
!(CurContext->isTranslationUnit()) && !CurContext->isNamespace() &&
!isa<LinkageSpecDecl>(CurContext)) {
// Push and pop can only occur at file or namespace scope, or within a
// language linkage declaration.
Diag(Loc, diag::err_pragma_fc_pp_scope);
return;
}

View File

@ -5,15 +5,35 @@ float function_scope(float a) {
return a;
}
// Ok, at namespace scope.
namespace foo {
#pragma float_control(push)
#pragma float_control(pop)
}
// Ok, within a language linkage specification.
extern "C" {
#pragma float_control(push)
#pragma float_control(pop)
}
// Same.
extern "C++" {
#pragma float_control(push)
#pragma float_control(pop)
}
#ifdef CHECK_ERROR
// Ok at file scope.
#pragma float_control(push)
#pragma float_control(pop)
#pragma float_control(precise, on, push)
void check_stack() {
#pragma float_control(push) // expected-error {{can only appear at file scope or namespace scope}}
#pragma float_control(pop) // expected-error {{can only appear at file scope or namespace scope}}
#pragma float_control(precise, on, push) // expected-error {{can only appear at file scope or namespace scope}}
#pragma float_control(except, on, push) // expected-error {{can only appear at file scope or namespace scope}}
// Not okay within a function declaration.
#pragma float_control(push) // expected-error {{can only appear at file or namespace scope or within a language linkage specification}}
#pragma float_control(pop) // expected-error {{can only appear at file or namespace scope or within a language linkage specification}}
#pragma float_control(precise, on, push) // expected-error {{can only appear at file or namespace scope or within a language linkage specification}}
#pragma float_control(except, on, push) // expected-error {{can only appear at file or namespace scope or within a language linkage specification}}
#pragma float_control(except, on, push, junk) // expected-error {{float_control is malformed}}
return;
}