Remove fp-contract changes, defer to a future PR

Author: Andy Kaylor

clang/docs/ReleaseNotes.rst

@@ -180,10 +180,9 @@ Modified Compiler Flags
   optimizations when the ``fast`` argument is used and to accept a new argument,
   ``aggressive``. The behavior of ``-ffp-model=aggressive`` is equivalent
   to the previous behavior of ``-ffp-model=fast``. The updated
-  ``-ffp-model=fast`` behavior no longer assumes finite math only, uses
+  ``-ffp-model=fast`` behavior no longer assumes finite math only and uses
   the ``promoted`` algorithm for complex division when possible rather than the
-  less basic (limited range) algorithm, and sets
-  ``-ffp-contract=fast-honor-pragmas`` rather than ``-ffp-contract=fast``.
+  less basic (limited range) algorithm.
 
 Removed Compiler Flags
 -------------------------

clang/docs/UsersManual.rst

@@ -1467,7 +1467,7 @@ floating point semantic models: precise (the default), strict, and fast.
   "except_behavior", "ignore", "strict", "ignore", "ignore"
   "fenv_access", "off", "on", "off", "off"
   "rounding_mode", "tonearest", "dynamic", "tonearest", "tonearest"
-  "contract", "on", "off", "fast-honor-pragmas", "fast-honor-pragmas"
+  "contract", "on", "off", "fast", "fast"
   "support_math_errno", "on", "on", "off", "off"
   "no_honor_nans", "off", "off", "off", "on"
   "no_honor_infinities", "off", "off", "off", "on"
@@ -1770,7 +1770,7 @@ for more details.
      top of the source file.
    * ``fast`` Behaves identically to specifying ``-funsafe-math-optimizations``,
      ``-fno-math-errno`` and ``-fcomplex-arithmetic=promoted``
-     ``ffp-contract=fast-honor-pragmas``
+     ``ffp-contract=fast``
    * ``aggressive`` Behaves identically to specifying both ``-ffast-math`` and
      ``ffp-contract=fast``
 

clang/lib/Driver/ToolChains/Clang.cpp

@@ -2935,12 +2935,10 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
     if (Aggressive) {
       HonorINFs = false;
       HonorNaNs = false;
-      FPContract = "fast";
       setComplexRange(LangOptions::ComplexRangeKind::CX_Basic);
     } else {
       HonorINFs = true;
       HonorNaNs = true;
-      FPContract = "fast-honor-pragmas";
       setComplexRange(LangOptions::ComplexRangeKind::CX_Promoted);
     }
     MathErrno = false;
@@ -2951,6 +2949,7 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
     TrappingMath = false;
     RoundingFPMath = false;
     FPExceptionBehavior = "";
+    FPContract = "fast";
     SeenUnsafeMathModeOption = true;
   };
 

clang/test/Driver/fp-model.c

@@ -142,7 +142,7 @@
 // CHECK-FPM-FAST-SAME: "-fno-signed-zeros"
 // CHECK-FPM-FAST-SAME: "-mreassociate"
 // CHECK-FPM-FAST-SAME: "-freciprocal-math"
-// CHECK-FPM-FAST-SAME: "-ffp-contract=fast-honor-pragmas"
+// CHECK-FPM-FAST-SAME: "-ffp-contract=fast"
 // CHECK-FPM-FAST-SAME: "-fno-rounding-math"
 // CHECK-FPM-FAST-NOT: "-ffast-math"
 // CHECK-FPM-FAST-NOT: "-ffinite-math-only"
@@ -214,7 +214,7 @@
 // CHECK-FASTMATH-FPM-FAST-SAME: "-fno-signed-zeros"
 // CHECK-FASTMATH-FPM-FAST-SAME: "-mreassociate"
 // CHECK-FASTMATH-FPM-FAST-SAME: "-freciprocal-math"
-// CHECK-FASTMATH-FPM-FAST-SAME: "-ffp-contract=fast-honor-pragmas"
+// CHECK-FASTMATH-FPM-FAST-SAME: "-ffp-contract=fast"
 // CHECK-FASTMATH-FPM-FAST-SAME: "-fno-rounding-math"
 // CHECK-FASTMATH-FPM-FAST-NOT: "-ffast-math"
 // CHECK-FASTMATH-FPM-FAST-NOT: "-ffinite-math-only"