Merge branch 'main' into string-enums

Author: FelixNumworks

ChangeLog.md

@@ -20,6 +20,13 @@ See docs/process.md for more on how version tagging works.
 
 4.0.15 (in development)
 -----------------------
+- The `-gsource-map` flag has been updated to be independent of other types of
+  debugging effects (in particular it no longer causes the wasm binary to have
+  a name section, and it no longer suppresses minification of the JS output).
+  To get the previous behavior, add `-g2` along with `-gsource-map`.
+  See also the newly updated
+  [documentation](https://emscripten.org/docs/porting/Debugging.html) which
+  covers debugging flags and use cases (#25238).
 
 4.0.14 - 09/02/25
 -----------------

docs/emcc.txt

@@ -49,8 +49,8 @@ Options that are modified or new in *emcc* are listed below:
 
 "-O1"
    [compile+link] Simple optimizations. During the compile step these
-   include LLVM "-O1" optimizations. During the link step this does
-   not include various runtime assertions in JS that *-O0* would do.
+   include LLVM "-O1" optimizations. During the link step this omits
+   various runtime assertions in JS that *-O0* would include.
 
 "-O2"
    [compile+link] Like "-O1", but enables more optimizations. During
@@ -68,15 +68,16 @@ Options that are modified or new in *emcc* are listed below:
 
 "-O3"
    [compile+link] Like "-O2", but with additional optimizations that
-   may take longer to run.
+   may take longer to run and may increase code size.
 
    Note:
 
      This is a good setting for a release build.
 
 "-Og"
-   [compile+link] Like "-O1". In future versions, this option might
-   disable different optimizations in order to improve debuggability.
+   [compile+link] Like "-O1", with an additional flag to extend the
+   liveness of variables for improved debugging. In future versions,
+   additional optimizations might also be disabled.
 
 "-Os"
    [compile+link] Like "-O3", but focuses more on code size (and may
@@ -182,9 +183,10 @@ Options that are modified or new in *emcc* are listed below:
    with "-c".
 
 "-gsource-map[=inline]"
-   [link] Generate a source map using LLVM debug information (which
-   must be present in object files, i.e., they should have been
-   compiled with "-g").
+   [compile+link] [same as -g3 if passed at compile time, otherwise
+   applies at link] Generate a source map using LLVM debug information
+   (which must be present in object files, i.e., they should have been
+   compiled with "-g" or "-gsource-map").
 
    When this option is provided, the **.wasm** file is updated to have
    a "sourceMappingURL" section. The resulting URL will have format:
@@ -200,32 +202,34 @@ Options that are modified or new in *emcc* are listed below:
    a large source map file).
 
 "-g<level>"
-   [compile+link] Controls the level of debuggability. Each level
-   builds on the previous one:
+   [compile+link] If used at compile time, adds progressively more
+   DWARF information to the object file, according to the underlying
+   behavior of clang. If used at link time, controls the level of
+   debuggability overall. Each level builds on the previous one:
 
       * "-g0": Make no effort to keep code debuggable.
 
-      * "-g1": When linking, preserve whitespace in JavaScript.
+      * "-g1": Preserve whitespace in JavaScript.
 
-      * "-g2": When linking, preserve function names in compiled code.
+      * "-g2": Also preserve function names in compiled code (via the
+        wasm name section).
 
-      * "-g3": When compiling to object files, keep debug info,
-        including JS whitespace, function names, and LLVM debug info
-        (DWARF) if any (this is the same as -g).
+      * "-g3": Also keep LLVM debug info (DWARF) if there is any in
+        the object files (this is the same as -g).
 
 "--profiling"
-   [same as -g2 if passed at compile time, otherwise applies at link]
-   Use reasonable defaults when emitting JavaScript to make the build
-   readable but still useful for profiling. This sets "-g2" (preserve
-   whitespace and function names) and may also enable optimizations
-   that affect performance and otherwise might not be performed in
-   "-g2".
+   [link] Make the output suitable for profiling. This means including
+   function names in the wasm and JS output, and preserving whitespace
+   in the JS output. It does not affect optimizations (to ensure that
+   performance profiles reflect production builds). Currenly this is
+   the same as "-g2".
 
 "--profiling-funcs"
-   [link] Preserve function names in profiling, but otherwise minify
-   whitespace and names as we normally do in optimized builds. This is
-   useful if you want to look at profiler results based on function
-   names, but do *not* intend to read the emitted code.
+   [link] Preserve wasm function names as in "--profiling", but
+   otherwise minify whitespace and names as we normally do in
+   optimized builds. This is useful if you want to look at profiler
+   results based on function names, but do *not* intend to read the
+   emitted code.
 
 "--tracing"
    [link] Enable the Emscripten Tracing API.
@@ -240,7 +244,9 @@ Options that are modified or new in *emcc* are listed below:
    [link] Save a map file between function indexes in the Wasm and
    function names. By storing the names on a file on the side, you can
    avoid shipping the names, and can still reconstruct meaningful
-   stack traces by translating the indexes back to the names.
+   stack traces by translating the indexes back to the names. This is
+   a simpler format than source maps, but less detailed because it
+   only describes function names and not source locations.
 
    Note: