d: Merge upstream dmd 3982604c5, druntime bc58b1e9, phobos 12329adb6.

[thirdparty/gcc.git] / gcc / d / d-lang.cc

diff --git a/gcc/d/d-lang.cc b/gcc/d/d-lang.cc
index 576eefcc01f21ae2cbbe99d4795cb87cc442aa2d..2c5d206a95fa69193f320ab8055d86d4fe8a0cf7 100644 (file)
--- a/gcc/d/d-lang.cc
+++ b/gcc/d/d-lang.cc
@@ -620,10 +620,6 @@ d_handle_option (size_t scode, const char *arg, HOST_WIDE_INT value,
       global.params.inclusiveInContracts = value;
       break;
 
-    case OPT_fpreview_intpromote:
-      global.params.fix16997 = value;
-      break;
-
     case OPT_fpreview_nosharedaccess:
       global.params.noSharedAccess = value;
       break;
@@ -642,8 +638,9 @@ d_handle_option (size_t scode, const char *arg, HOST_WIDE_INT value,
 
     case OPT_frevert_all:
       global.params.useDIP25 = FeatureState::disabled;
-      global.params.markdown = !value;
       global.params.dtorFields = FeatureState::disabled;
+      global.params.fix16997 = !value;
+      global.params.markdown = !value;
       break;
 
     case OPT_frevert_dip25:
@@ -654,6 +651,10 @@ d_handle_option (size_t scode, const char *arg, HOST_WIDE_INT value,
       global.params.dtorFields = FeatureState::disabled;
       break;
 
+    case OPT_frevert_intpromote:
+      global.params.fix16997 = !value;
+      break;
+
     case OPT_frevert_markdown:
       global.params.markdown = !value;
       break;