From: Andrea Corallo <akrl@sdf.org>
Date: Wed, 31 Mar 2021 18:13:46 +0000 (+0200)
Subject: Rework native compilation `comp-debug' (bug#46495)
X-Git-Tag: emacs-28.0.90~2727^2~47
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=53ca0d98441da75be49111a3a88c1a7629f27d6d;p=emacs.git

Rework native compilation `comp-debug' (bug#46495)

	* lisp/emacs-lisp/comp.el (comp-debug): Update docstring and
	move default on Windows systems from 0 to 1.
	* src/comp.c (Fcomp__compile_ctxt_to_file): Tweak debug
	levels.
---

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 2f9738a7e20..59e9dbc0138 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -56,14 +56,14 @@
   :safe #'integerp
   :version "28.1")
 
-(defcustom comp-debug 0
+(defcustom comp-debug (if (eq 'windows-nt system-type) 1 0)
   "Debug level for native compilation, a number between 0 and 3.
 This is intended for debugging the compiler itself.
-  0 no debugging output.
-    This is the recommended value unless you are debugging the compiler itself.
-  1 emit debug symbols and dump pseudo C code.
-  2 dump gcc passes.
-  3 dump libgccjit log file."
+  0 no debug output.
+  1 emit debug symbols.
+  2 emit debug symbols and dump pseudo C code.
+  3 emit debug symbols and dump: pseudo C code, GCC intermediate
+  passes and libgccjit log file."
   :type 'integer
   :safe #'natnump
   :version "28.1")
diff --git a/src/comp.c b/src/comp.c
index b286f6077f3..a87a8f30c35 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -4431,7 +4431,7 @@ DEFUN ("comp--compile-ctxt-to-file", Fcomp__compile_ctxt_to_file,
       gcc_jit_context_set_bool_option (comp.ctxt,
 				       GCC_JIT_BOOL_OPTION_DEBUGINFO,
 				       1);
-  if (comp.debug > 2)
+  if (comp.debug >= 3)
     {
       logfile = emacs_fopen ("libgccjit.log", "w");
       gcc_jit_context_set_logfile (comp.ctxt,
@@ -4493,7 +4493,7 @@ DEFUN ("comp--compile-ctxt-to-file", Fcomp__compile_ctxt_to_file,
 
   add_driver_options ();
 
-  if (comp.debug)
+  if (comp.debug >= 1)
       gcc_jit_context_dump_to_file (comp.ctxt,
 				    format_string ("%s.c", SSDATA (ebase_name)),
 				    1);