[clang] 4aea70e - [FPEnv] Extended FPOptions with new attributes
Serge Pavlov via cfe-commits
cfe-commits at lists.llvm.org
Sun Jan 26 06:07:00 PST 2020
Author: Serge Pavlov
Date: 2020-01-26T21:03:53+07:00
New Revision: 4aea70ed3292f02aa111ff6894805e2613dd81e8
URL: https://github.com/llvm/llvm-project/commit/4aea70ed3292f02aa111ff6894805e2613dd81e8
DIFF: https://github.com/llvm/llvm-project/commit/4aea70ed3292f02aa111ff6894805e2613dd81e8.diff
LOG: [FPEnv] Extended FPOptions with new attributes
This change added two new attributes, rounding mode and exception
behavior to the structure FPOptions. These attributes allow more
flexible treatment of specific floating point environment than it is
provided by #pragma STDC FENV_ACCESS.
Differential Revision: https://reviews.llvm.org/D65994
Added:
Modified:
clang/include/clang/AST/Stmt.h
clang/include/clang/Basic/LangOptions.h
clang/include/clang/Sema/Sema.h
clang/lib/Parse/ParseStmt.cpp
clang/lib/Sema/SemaAttr.cpp
clang/lib/Sema/TreeTransform.h
Removed:
################################################################################
diff --git a/clang/include/clang/AST/Stmt.h b/clang/include/clang/AST/Stmt.h
index 253b76941991..0b29857c37e3 100644
--- a/clang/include/clang/AST/Stmt.h
+++ b/clang/include/clang/AST/Stmt.h
@@ -530,7 +530,7 @@ class alignas(void *) Stmt {
/// This is only meaningful for operations on floating point
/// types and 0 otherwise.
- unsigned FPFeatures : 3;
+ unsigned FPFeatures : 8;
SourceLocation OpLoc;
};
@@ -601,7 +601,7 @@ class alignas(void *) Stmt {
unsigned OperatorKind : 6;
// Only meaningful for floating point types.
- unsigned FPFeatures : 3;
+ unsigned FPFeatures : 8;
};
class CXXRewrittenBinaryOperatorBitfields {
diff --git a/clang/include/clang/Basic/LangOptions.h b/clang/include/clang/Basic/LangOptions.h
index ae4a4b2b9e87..524ae9a822f4 100644
--- a/clang/include/clang/Basic/LangOptions.h
+++ b/clang/include/clang/Basic/LangOptions.h
@@ -357,17 +357,25 @@ class LangOptions : public LangOptionsBase {
class FPOptions {
public:
FPOptions() : fp_contract(LangOptions::FPC_Off),
- fenv_access(LangOptions::FEA_Off) {}
+ fenv_access(LangOptions::FEA_Off),
+ rounding(LangOptions::FPR_ToNearest),
+ exceptions(LangOptions::FPE_Ignore)
+ {}
// Used for serializing.
explicit FPOptions(unsigned I)
: fp_contract(static_cast<LangOptions::FPContractModeKind>(I & 3)),
- fenv_access(static_cast<LangOptions::FEnvAccessModeKind>((I >> 2) & 1))
+ fenv_access(static_cast<LangOptions::FEnvAccessModeKind>((I >> 2) & 1)),
+ rounding(static_cast<LangOptions::FPRoundingModeKind>((I >> 3) & 7)),
+ exceptions(static_cast<LangOptions::FPExceptionModeKind>((I >> 6) & 3))
{}
explicit FPOptions(const LangOptions &LangOpts)
: fp_contract(LangOpts.getDefaultFPContractMode()),
- fenv_access(LangOptions::FEA_Off) {}
+ fenv_access(LangOptions::FEA_Off),
+ rounding(LangOptions::FPR_ToNearest),
+ exceptions(LangOptions::FPE_Ignore)
+ {}
// FIXME: Use getDefaultFEnvAccessMode() when available.
bool allowFPContractWithinStatement() const {
@@ -398,14 +406,42 @@ class FPOptions {
void setDisallowFEnvAccess() { fenv_access = LangOptions::FEA_Off; }
+ LangOptions::FPRoundingModeKind getRoundingMode() const {
+ return static_cast<LangOptions::FPRoundingModeKind>(rounding);
+ }
+
+ void setRoundingMode(LangOptions::FPRoundingModeKind RM) {
+ rounding = RM;
+ }
+
+ LangOptions::FPExceptionModeKind getExceptionMode() const {
+ return static_cast<LangOptions::FPExceptionModeKind>(exceptions);
+ }
+
+ void setExceptionMode(LangOptions::FPExceptionModeKind EM) {
+ exceptions = EM;
+ }
+
+ bool isFPConstrained() const {
+ return getRoundingMode() != LangOptions::FPR_ToNearest ||
+ getExceptionMode() != LangOptions::FPE_Ignore ||
+ allowFEnvAccess();
+ }
+
/// Used to serialize this.
- unsigned getInt() const { return fp_contract | (fenv_access << 2); }
+ unsigned getInt() const {
+ return fp_contract | (fenv_access << 2) | (rounding << 3)
+ | (exceptions << 6);
+ }
private:
- /// Adjust BinaryOperator::FPFeatures to match the total bit-field size
- /// of these two.
+ /// Adjust BinaryOperatorBitfields::FPFeatures and
+ /// CXXOperatorCallExprBitfields::FPFeatures to match the total bit-field size
+ /// of these fields.
unsigned fp_contract : 2;
unsigned fenv_access : 1;
+ unsigned rounding : 3;
+ unsigned exceptions : 2;
};
/// Describes the kind of translation unit being processed.
diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h
index 64a6793aa411..5a33e4aa6ffc 100644
--- a/clang/include/clang/Sema/Sema.h
+++ b/clang/include/clang/Sema/Sema.h
@@ -1306,12 +1306,12 @@ class Sema final {
/// should not be used elsewhere.
void EmitCurrentDiagnostic(unsigned DiagID);
- /// Records and restores the FP_CONTRACT state on entry/exit of compound
+ /// Records and restores the FPFeatures state on entry/exit of compound
/// statements.
- class FPContractStateRAII {
+ class FPFeaturesStateRAII {
public:
- FPContractStateRAII(Sema &S) : S(S), OldFPFeaturesState(S.FPFeatures) {}
- ~FPContractStateRAII() { S.FPFeatures = OldFPFeaturesState; }
+ FPFeaturesStateRAII(Sema &S) : S(S), OldFPFeaturesState(S.FPFeatures) {}
+ ~FPFeaturesStateRAII() { S.FPFeatures = OldFPFeaturesState; }
private:
Sema& S;
@@ -9409,6 +9409,12 @@ class Sema final {
/// \#pragma STDC FENV_ACCESS
void ActOnPragmaFEnvAccess(LangOptions::FEnvAccessModeKind FPC);
+ /// Called to set rounding mode for floating point operations.
+ void setRoundingMode(LangOptions::FPRoundingModeKind);
+
+ /// Called to set exception behavior for floating point operations.
+ void setExceptionMode(LangOptions::FPExceptionModeKind);
+
/// AddAlignmentAttributesForRecord - Adds any needed alignment attributes to
/// a the record decl, to handle '\#pragma pack' and '\#pragma options align'.
void AddAlignmentAttributesForRecord(RecordDecl *RD);
diff --git a/clang/lib/Parse/ParseStmt.cpp b/clang/lib/Parse/ParseStmt.cpp
index 0339328ca513..492db4d6390c 100644
--- a/clang/lib/Parse/ParseStmt.cpp
+++ b/clang/lib/Parse/ParseStmt.cpp
@@ -1014,9 +1014,9 @@ StmtResult Parser::ParseCompoundStatementBody(bool isStmtExpr) {
Tok.getLocation(),
"in compound statement ('{}')");
- // Record the state of the FP_CONTRACT pragma, restore on leaving the
+ // Record the state of the FPFeatures, restore on leaving the
// compound statement.
- Sema::FPContractStateRAII SaveFPContractState(Actions);
+ Sema::FPFeaturesStateRAII SaveFPContractState(Actions);
InMessageExpressionRAIIObject InMessage(*this, false);
BalancedDelimiterTracker T(*this, tok::l_brace);
diff --git a/clang/lib/Sema/SemaAttr.cpp b/clang/lib/Sema/SemaAttr.cpp
index cd2a65276b09..9b8dc148d6be 100644
--- a/clang/lib/Sema/SemaAttr.cpp
+++ b/clang/lib/Sema/SemaAttr.cpp
@@ -940,6 +940,14 @@ void Sema::ActOnPragmaFPContract(LangOptions::FPContractModeKind FPC) {
}
}
+void Sema::setRoundingMode(LangOptions::FPRoundingModeKind FPR) {
+ FPFeatures.setRoundingMode(FPR);
+}
+
+void Sema::setExceptionMode(LangOptions::FPExceptionModeKind FPE) {
+ FPFeatures.setExceptionMode(FPE);
+}
+
void Sema::ActOnPragmaFEnvAccess(LangOptions::FEnvAccessModeKind FPC) {
switch (FPC) {
case LangOptions::FEA_On:
diff --git a/clang/lib/Sema/TreeTransform.h b/clang/lib/Sema/TreeTransform.h
index d6105353bbdf..6b90a9e8a1ed 100644
--- a/clang/lib/Sema/TreeTransform.h
+++ b/clang/lib/Sema/TreeTransform.h
@@ -9938,7 +9938,7 @@ TreeTransform<Derived>::TransformBinaryOperator(BinaryOperator *E) {
RHS.get() == E->getRHS())
return E;
- Sema::FPContractStateRAII FPContractState(getSema());
+ Sema::FPFeaturesStateRAII FPFeaturesState(getSema());
getSema().FPFeatures = E->getFPFeatures();
return getDerived().RebuildBinaryOperator(E->getOperatorLoc(), E->getOpcode(),
@@ -10464,7 +10464,7 @@ TreeTransform<Derived>::TransformCXXOperatorCallExpr(CXXOperatorCallExpr *E) {
(E->getNumArgs() != 2 || Second.get() == E->getArg(1)))
return SemaRef.MaybeBindToTemporary(E);
- Sema::FPContractStateRAII FPContractState(getSema());
+ Sema::FPFeaturesStateRAII FPFeaturesState(getSema());
getSema().FPFeatures = E->getFPFeatures();
return getDerived().RebuildCXXOperatorCallExpr(E->getOperator(),
More information about the cfe-commits
mailing list