Adress comments

asmcomp/CSEgen.ml

@@ -362,6 +362,10 @@ method private cse n i =
               next = self#cse empty_numbering i.next}
 
 method fundecl f =
-  {f with fun_body = self#cse empty_numbering f.fun_body}
+  (* CSE can trigger bad register allocation behaviors, see MPR#7630 *)
+  if List.mem Cmm.No_CSE f.fun_codegen_options then
+    f
+  else
+    {f with fun_body = self#cse empty_numbering f.fun_body }
 
 end

asmcomp/asmgen.ml

@@ -99,13 +99,6 @@ let rec regalloc ppf round fd =
     Reg.reinit(); Liveness.fundecl ppf newfd; regalloc ppf (round + 1) newfd
   end else newfd
 
-let cse fd =
-  (* CSE can trigger bad register allocation behaviors, see MPR#7630 *)
-  if List.mem Cmm.No_CSE fd.Mach.fun_codegen_options then
-    fd
-  else
-    CSE.fundecl fd
-
 let (++) x f = f x
 
 let compile_fundecl (ppf : formatter) fd_cmm =
@@ -116,7 +109,7 @@ let compile_fundecl (ppf : formatter) fd_cmm =
   ++ pass_dump_if ppf dump_selection "After instruction selection"
   ++ Profile.record ~accumulate:true "comballoc" Comballoc.fundecl
   ++ pass_dump_if ppf dump_combine "After allocation combining"
-  ++ Profile.record ~accumulate:true "cse" cse
+  ++ Profile.record ~accumulate:true "cse" CSE.fundecl
   ++ pass_dump_if ppf dump_cse "After CSE"
   ++ Profile.record ~accumulate:true "liveness" (liveness ppf)
   ++ Profile.record ~accumulate:true "deadcode" Deadcode.fundecl

testsuite/tests/asmgen/parsecmm.mly

@@ -142,8 +142,13 @@ phrase:
 fundecl:
     LPAREN FUNCTION fun_name LPAREN params RPAREN sequence RPAREN
       { List.iter (fun (id, ty) -> unbind_ident id) $5;
-        {fun_name = $3; fun_args = $5; fun_body = $7; fun_fast = true;
-         fun_fast_compile = true;
+        {fun_name = $3; fun_args = $5; fun_body = $7;
+         fun_codegen_options =
+           if Config.flambda then [
+             Reduce_code_size;
+             No_CSE;
+           ]
+           else [ Reduce_code_size ];
          fun_dbg = debuginfo ()} }
 ;
 fun_name: