melange-re · anmonteiro · Dec 16, 2024 · Nov 24, 2024 · Nov 24, 2024 · Dec 16, 2024
diff --git a/Changes.md b/Changes.md
@@ -54,6 +54,8 @@ Unreleased
   ([#1218](https://github.com/melange-re/melange/pull/1218))
 - `melange.js`: add `TypedArray` types at the toplevel in the `Js` module
   ([#1248](https://github.com/melange-re/melange/pull/1248))
+- BREAKING: remove `--mel-g`
+  ([#1234](https://github.com/melange-re/melange/pull/1234))
 
 4.0.1 2024-06-07
 ---------------

diff --git a/bin/melc.ml b/bin/melc.ml
@@ -217,7 +217,6 @@ let main: Melc_cli.t -> _ Cmdliner.Term.ret
       bs_package_output;
       mel_module_system;
       bs_syntax_only;
-      bs_g;
       bs_package_name;
       bs_module_name;
       as_ppx;
@@ -302,8 +301,6 @@ let main: Melc_cli.t -> _ Cmdliner.Term.ret
       bs_cross_module_opt ;
     if bs_syntax_only then Js_config.syntax_only := bs_syntax_only;
 
-    if bs_g then Js_config.debug := bs_g;
-
     Option.iter Js_packages_state.set_package_name bs_package_name;
     begin match mel_module_system, bs_package_output with
     | None, [] -> ()

diff --git a/bin/melc_cli.ml b/bin/melc_cli.ml
@@ -36,7 +36,6 @@ type t = {
   bs_package_output : string list;
   mel_module_system : Module_system.t option;
   bs_syntax_only : bool;
-  bs_g : bool;
   bs_package_name : string option;
   bs_module_name : string option;
   as_ppx : bool;
@@ -148,10 +147,6 @@ let bs_syntax_only =
   let doc = "Only check syntax" in
   Arg.(value & flag & info [ "bs-syntax-only"; "mel-syntax-only" ] ~doc)
 
-let bs_g =
-  let doc = "Debug mode" in
-  Arg.(value & flag & info [ "bs-g"; "mel-g" ] ~doc)
-
 let bs_package_name =
   let doc = "Set package name, useful when you want to produce npm packages" in
   Arg.(
@@ -477,7 +472,7 @@ module Compat = struct
 end
 
 let parse help include_dirs hidden_include_dirs alerts warnings output_name ppx
-    open_modules bs_package_output mel_module_system bs_syntax_only bs_g
+    open_modules bs_package_output mel_module_system bs_syntax_only
     bs_package_name bs_module_name as_ppx as_pp no_alias_deps bs_gentype
     unboxed_types bs_unsafe_empty_array nostdlib color bs_eval bs_cmi_only
     bs_no_version_header bs_cross_module_opt bs_diagnose where verbose keep_locs
@@ -498,7 +493,6 @@ let parse help include_dirs hidden_include_dirs alerts warnings output_name ppx
     bs_package_output;
     mel_module_system;
     bs_syntax_only;
-    bs_g;
     bs_package_name;
     bs_module_name;
     as_ppx;
@@ -557,7 +551,7 @@ let cmd =
   Term.(
     const parse $ help $ include_dirs $ hidden_include_dirs $ alerts $ warnings
     $ output_name $ ppx $ open_modules $ Internal.bs_package_output
-    $ Internal.mel_module_system $ bs_syntax_only $ bs_g $ bs_package_name
+    $ Internal.mel_module_system $ bs_syntax_only $ bs_package_name
     $ bs_module_name $ Internal.as_ppx $ Internal.as_pp $ Internal.no_alias_deps
     $ Internal.bs_gentype $ unboxed_types $ Internal.bs_unsafe_empty_array
     $ Internal.nostdlib $ color $ Internal.bs_eval $ Internal.bs_cmi_only

diff --git a/jscomp/core/js_config.ml b/jscomp/core/js_config.ml
@@ -65,7 +65,6 @@ let diagnose = ref false
 let tool_name = "Melange"
 let check_div_by_zero = ref true
 let syntax_only = ref false
-let debug = ref false
 let cmi_only = ref false
 let cmj_only = ref false
 let js_stdout = ref true

diff --git a/jscomp/core/js_config.mli b/jscomp/core/js_config.mli
@@ -38,7 +38,6 @@ val check_div_by_zero : bool ref
 
 val tool_name : string
 val syntax_only : bool ref
-val debug : bool ref
 
 val cmi_only : bool ref
 (** stop after generating cmi *)

diff --git a/jscomp/core/js_dump.ml b/jscomp/core/js_dump.ml
@@ -801,10 +801,8 @@ and expression_desc cxt ~(level : int) x : cxt =
   | Caml_block { fields = el; tag; tag_info = Blk_record_inlined p; _ } ->
       let objs =
         let tails =
-          List.map_combine_array_append p.fields el
-            ~init:(if !Js_config.debug then [ (Js_op.Symbol_name, E.str p.name) ]
-             else [])
-            ~f:(fun i -> Js_op.Lit i)
+          List.map_combine_array_append p.fields el ~init:[] ~f:(fun i ->
+              Js_op.Lit i)
         in
         let as_value =
           Lam_constant_convert.modifier ~name:p.name p.attributes
@@ -833,10 +831,6 @@ and expression_desc cxt ~(level : int) x : cxt =
             ~f:(fun i e ->
               (Js_op.Lit (E.variant_pos ~constr:p.name (Int32.of_int i)), e))
             el
-          @
-          if !Js_config.debug && not is_cons then
-            [ (Symbol_name, E.str p.name) ]
-          else []
         in
         if is_cons && p.num_nonconst = 1 then tails
         else

diff --git a/jscomp/test/debug_mode_value.ml b/jscomp/test/debug_mode_value.ml
diff --git a/jscomp/test/gpr_4407_test.ml b/jscomp/test/gpr_4407_test.ml