Remove -funfolding-update-in-place flag documentation

This flag does nothing, and should have been removed ages ago. (GHC
no longer does update-in-place.)

MERGE to 6.8 branch

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index a244544..512a27a 100644 (file)
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -375,7 +375,6 @@ isStaticFlag f =
        "fruntime-types",
        "fno-pre-inlining",
        "fexcess-precision",
-       "funfolding-update-in-place",
        "static",
        "fhardwire-lib-paths",
        "funregisterised",

diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index a00a4f1..cb993af 100644 (file)
--- a/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@ -1347,13 +1347,6 @@
            </row>
 
            <row>
-             <entry><option>-funfolding-update-in-place</option></entry>
-             <entry>Tweak unfolding settings</entry>
-             <entry>static</entry>
-             <entry><option>-fno-unfolding-update-in-place</option></entry>
-           </row>
-
-           <row>
              <entry><option>-funfolding-use-threshold</option></entry>
              <entry>Tweak unfolding settings</entry>
              <entry>static</entry>

diff --git a/docs/users_guide/using.xml b/docs/users_guide/using.xml
index 5e8be42..c175ca1 100644 (file)
--- a/docs/users_guide/using.xml
+++ b/docs/users_guide/using.xml
@@ -1602,24 +1602,6 @@ f "2"    = 2
 
        <varlistentry>
          <term>
-            <option>-funfolding-update-in-place=<replaceable>n</replaceable></option>
-            <indexterm><primary><option>-funfolding-update-in-place</option></primary></indexterm>
-          </term>
-         <listitem>
-           <para>Switches on an experimental "optimisation".
-            Switching it on makes the compiler a little keener to
-            inline a function that returns a constructor, if the
-            context is that of a thunk.
-<programlisting>
-   x = plusInt a b
-</programlisting>
-            If we inlined plusInt we might get an opportunity to use
-            update-in-place for the thunk 'x'.</para>
-         </listitem>
-       </varlistentry>
-
-       <varlistentry>
-         <term>
             <option>-funfolding-creation-threshold=<replaceable>n</replaceable></option>:
            <indexterm><primary><option>-funfolding-creation-threshold</option></primary></indexterm>
            <indexterm><primary>inlining, controlling</primary></indexterm>