Add -f[no-]header-guard-opt

Added so that one can determine the include graph from the -E output.

gcc/REVISION

@@ -0,0 +1 @@
+[c++-modules]

gcc/c-family/c-opts.c

@@ -477,6 +477,10 @@ c_common_handle_option (size_t scode, const char *arg, HOST_WIDE_INT value,
       cpp_opts->extended_identifiers = value;
       break;
 
+    case OPT_fheader_guard_opt:
+      cpp_opts->no_header_guard_opt = !value;
+      break;
+
     case OPT_fmax_include_depth_:
 	cpp_opts->max_include_depth = value;
       break;

gcc/c-family/c.opt

@@ -1660,6 +1660,10 @@ C++ ObjC++ WarnRemoved
 fhandle-exceptions
 C++ ObjC++ Optimization Alias(fexceptions) Warn({%<-fhandle-exceptions%> has been renamed %<-fexceptions%> (and is now on by default)})
 
+fheader-guard-opt
+C ObjC C++ ObjC++
+Enable header file include guard optimization.
+
 fhonor-std
 C++ ObjC++ WarnRemoved
 

gcc/configure

@@ -7883,6 +7883,8 @@ fi
 
 
 
+# ACX_BUGURL([https://gcc.gnu.org/bugs/])
+# '\#' needed to escape hash to Make
 
 
 # Check whether --with-bugurl was given.
@@ -7895,7 +7897,7 @@ if test "${with_bugurl+set}" = set; then :
 	   ;;
      esac
 else
-  BUGURL="https://gcc.gnu.org/bugs/"
+  BUGURL="https://gcc.gnu.org/wiki/cxx-modules\#Bugs"
 
 fi
 

gcc/configure.ac

@@ -1013,7 +1013,9 @@ AC_ARG_WITH(specs,
 AC_SUBST(CONFIGURE_SPECS)
 
 ACX_PKGVERSION([GCC])
-ACX_BUGURL([https://gcc.gnu.org/bugs/])
+# ACX_BUGURL([https://gcc.gnu.org/bugs/])
+# '\#' needed to escape hash to Make
+ACX_BUGURL([https://gcc.gnu.org/wiki/cxx-modules\#Bugs])
 
 # Allow overriding the default URL for documentation
 AC_ARG_WITH(documentation-root-url,

gcc/cp/Make-lang.in

@@ -64,6 +64,17 @@ ifneq ($(DEVPHASE_c),)
 MODULE_VERSION := $(shell date -r $(srcdir)/cp/module.cc '+%y%m%d-%H%M' \
   2>/dev/null || date '+%y%m%d-0000' 2>/dev/null || echo 0)
 
+version.o : $(srcdir)/cp/module.cc
+# Set REVISION string
+ifeq ($(REVISION_c),)
+REVISION_c := []
+REVISION_s := '"[modules revision 20$(MODULE_VERSION)]"'
+else
+ifeq ($(words $(REVISION_c)),1)
+# Wedge inside [...], if that's what it already looks like
+REVISION_s := '" $(REVISION_c:]=) revision 20$(MODULE_VERSION)]"'
+endif
+endif
 CFLAGS-cp/module.o += -DMODULE_VERSION='($(subst -,,$(MODULE_VERSION))U)'
 endif
 

gcc/cp/decl.c

@@ -4966,21 +4966,6 @@ push_throw_library_fn (tree name, tree type)
 void
 fixup_anonymous_aggr (tree t)
 {
-  /* Wipe out memory of synthesized methods.  */
-  TYPE_HAS_USER_CONSTRUCTOR (t) = 0;
-  TYPE_HAS_DEFAULT_CONSTRUCTOR (t) = 0;
-  TYPE_HAS_COPY_CTOR (t) = 0;
-  TYPE_HAS_CONST_COPY_CTOR (t) = 0;
-  TYPE_HAS_COPY_ASSIGN (t) = 0;
-  TYPE_HAS_CONST_COPY_ASSIGN (t) = 0;
-
-  /* Splice the implicitly generated functions out of TYPE_FIELDS.  */
-  for (tree probe, *prev_p = &TYPE_FIELDS (t); (probe = *prev_p);)
-    if (TREE_CODE (probe) == FUNCTION_DECL && DECL_ARTIFICIAL (probe))
-      *prev_p = DECL_CHAIN (probe);
-    else
-      prev_p = &DECL_CHAIN (probe);
-
   /* Anonymous aggregates cannot have fields with ctors, dtors or complex
      assignment operators (because they cannot have these methods themselves).
      For anonymous unions this is already checked because they are not allowed

gcc/cp/module.cc

@@ -19144,22 +19144,28 @@ maybe_translate_include (cpp_reader *reader, line_maps *lmaps, location_t loc,
 
   size_t len = strlen (path);
   path = canonicalize_header_name (NULL, loc, true, path, len);
-  auto packet = mapper->IncludeTranslate (path, Cody::Flags::None, len);
   int xlate = false;
-  if (packet.GetCode () == Cody::Client::PC_BOOL)
-    xlate = -int (packet.GetInteger ());
-  else if (packet.GetCode () == Cody::Client::PC_PATHNAME)
-    {
-      /* Record the CMI name for when we do the import.  */
-      module_state *import = get_module (build_string (len, path));
-      import->set_filename (packet);
-      xlate = +1;
-    }
+  auto name_str = build_string (len, path);
+  if (get_module_slot (name_str, nullptr, false, false))
+    /* We've already met this header.  */
+    xlate = +1;
   else
     {
-      gcc_checking_assert (packet.GetCode () == Cody::Client::PC_ERROR);
-      error_at (loc, "cannot determine %<#include%> translation of %s: %s",
-		path, packet.GetString ().c_str ());
+      auto packet = mapper->IncludeTranslate (path, Cody::Flags::None, len);
+      if (packet.GetCode () == Cody::Client::PC_BOOL)
+	xlate = -int (packet.GetInteger ());
+      else if (packet.GetCode () == Cody::Client::PC_PATHNAME)
+	{
+	  /* Record the CMI name for when we do the import.  */
+	  get_module (name_str)->set_filename (packet);
+	  xlate = +1;
+	}
+      else
+	{
+	  gcc_checking_assert (packet.GetCode () == Cody::Client::PC_ERROR);
+	  error_at (loc, "cannot determine %<#include%> translation of %s: %s",
+		    path, packet.GetString ().c_str ());
+	}
     }
 
   bool note = false;

gcc/diagnostic.c

@@ -643,6 +643,15 @@ diagnostic_action_after_output (diagnostic_context *context,
 	if (context->abort_on_error)
 	  real_abort ();
 
+#if 1
+	fnotice (stderr, "We are damaged, This is broken.\n"
+		 "Logic is lost,\nWe struggle,\n"
+		 "Hunt through the rubble for what once was.\n");
+	fnotice (stderr, "THIS IS AN IN-DEVELOPMENT COMPILER,"
+		 " it barfed, quelle horreur\n"
+		 "See %s, WHICH IS NOT THE USUAL REPORTING MECHANISM!\n",
+		 bug_report_url);
+#else
 	fnotice (stderr, "Please submit a full bug report,\n"
 		 "with preprocessed source if appropriate.\n");
 	if (count > 0)
@@ -650,6 +659,7 @@ diagnostic_action_after_output (diagnostic_context *context,
 		   ("Please include the complete backtrace "
 		    "with any bug report.\n"));
 	fnotice (stderr, "See %s for instructions.\n", bug_report_url);
+#endif
 
 	exit (ICE_EXIT_CODE);
       }
@@ -659,6 +669,12 @@ diagnostic_action_after_output (diagnostic_context *context,
 	real_abort ();
       diagnostic_finish (context);
       fnotice (stderr, "compilation terminated.\n");
+#if 1
+      fnotice (stderr, "THIS IS AN IN-DEVELOPMENT COMPILER,"
+	       " it ate something that didn't agree with it\n"
+	       "See %s, WHICH IS NOT THE USUAL REPORTING MECHANISM!\n",
+	       bug_report_url);
+#endif
       exit (FATAL_EXIT_CODE);
 
     default:

gcc/doc/cppopts.texi

@@ -266,6 +266,20 @@ standard versions) and C++.
 @opindex fno-canonical-system-headers
 When preprocessing, do not shorten system header paths with canonicalization.
 
+@item -fno-header-guard-opt
+@opindex fno-header-guard-opt
+This disables the preprocessor's optimization of header files that
+have a macro header-guard.  Usually such files are do not appear at
+all in the preprocessed output on their second and subsequent
+inclusion.  This disables that optimization such that they will appear
+in the @code{#} line directive output, but of course their contents
+will be elided by the controlling @code{#if} directive.  This also
+covers C++ 20 include-translated header-unit imports, those will be
+subject to multiple include translations.  This option is useful to
+discover the complete #include graph of a translation unit.  It does
+not apply to idempotent headerfiles marked with @code{#pragma once},
+nor to headers read with @code{#import}.
+
 @item -fmax-include-depth=@var{depth}
 @opindex fmax-include-depth
 Set the maximum depth of the nested #include. The default is 200. 

gcc/gcc.c

@@ -3397,6 +3397,35 @@ execute (void)
       int err;
       const char *string = commands[i].argv[0];
 
+      if (false && commands[i].argv == argbuf.address ())
+	{
+	  /* Munge argv[0], the one given to the exec'd command, to
+	     include information about from whence it was spawned.  We
+	     preserve the directory component so the command can
+	     determine where it is, but not what it was called.
+	     Thus its otherwise unlocated errors specify something
+	     like 'g++.cc1plus' rather than plan 'cc1plus'.  */
+	  size_t slen = strlen (string);
+	  size_t plen = strlen (progname);
+	  size_t tlen = strlen (commands[i].prog);
+
+	  while (slen && !IS_DIR_SEPARATOR (string[slen-1]))
+	    slen--;
+	  char *ren = XNEWVEC (char, slen + plen + tlen + 3);
+	  size_t off = 0;
+
+	  memcpy (ren + off, string, slen);
+	  off += slen;
+	  memcpy (ren + off, progname, plen);
+	  off += plen;
+	  ren[off++] = '.';
+	  memcpy (ren + off, commands[i].prog, tlen);
+	  off += tlen;
+	  ren[off++] = 0;
+
+	  commands[i].argv[0] = ren;
+	}
+
       errmsg = pex_run (pex,
 			((i + 1 == n_commands ? PEX_LAST : 0)
 			 | (string == commands[i].prog ? PEX_SEARCH : 0)),
@@ -3411,6 +3440,12 @@ execute (void)
 		       string, errmsg);
 	}
 
+      if (commands[i].argv[0] != string)
+	{
+	  free (const_cast <char *> (commands[i].argv[0]));
+	  commands[i].argv[0] = string;
+	}
+
       if (i && string != commands[i].prog)
 	free (CONST_CAST (char *, string));
     }
@@ -8639,7 +8674,16 @@ driver::maybe_print_and_exit () const
 
       if (! verbose_flag)
 	{
+#if 1
+	  printf ("\nTHIS IS AN IN-DEVELOPMENT COMPILER\n"
+#if !CHECKING_P
+		  "This has been configured with --disable-checking,"
+		  " ARE YOU SURE THAT IS WISE?\n"
+#endif
+		  "For bug reporting, see the UNUSUAL URL:\n");
+#else
 	  printf (_("\nFor bug reporting instructions, please see:\n"));
+#endif
 	  printf ("%s.\n", bug_report_url);
 
 	  return (0);
@@ -9037,7 +9081,12 @@ driver::final_actions () const
 
   if (print_help_list)
     {
+#if 1
+      printf ("\nTHIS IS AN IN-DEVELOPMENT COMPILER\n"
+	      "For bug reporting, see the UNUSUAL URL:\n");
+#else
       printf (("\nFor bug reporting instructions, please see:\n"));
+#endif
       printf ("%s\n", bug_report_url);
     }
 }

gcc/gdbinit.in

@@ -333,6 +333,10 @@ b fancy_abort
 # Put a breakpoint on internal_error to help with debugging ICEs.
 b internal_error
 
+# Break on module streaming error
+b bytes_in::set_overrun if !overrun
+b elf::set_error if !err
+
 set complaints 0
 # Don't let abort actually run, as it will make
 # stdio stop working and therefore the `pr' command above as well.

gcc/testsuite/c-c++-common/cpp/headerguard.c

@@ -0,0 +1,8 @@
+/* { dg-do preprocess }  */
+/* Check header guards are optimized.  */
+
+#include "noheaderguard-b.h"
+#include "noheaderguard-b.h"
+#include "noheaderguard-a.h"
+
+/* { dg-final { scan-file headerguard.i {# [0-9]* "[^\n]*headerguard.c"\n\n*# [0-9]* "[^\n]*headerguard-b.h" 1\n\n*# [0-9]* "[^\n]*headerguard-a.h" 1\n\n*# [0-9]* "[^\n]*headerguard-b.h" 2\n\n*# [0-9]* "[^\n]*headerguard.c" 2\n} } } */

gcc/testsuite/c-c++-common/cpp/noheaderguard-a.h

@@ -0,0 +1,3 @@
+#ifndef INNER
+#define INNER
+#endif

gcc/testsuite/c-c++-common/cpp/noheaderguard-b.h

@@ -0,0 +1,4 @@
+#ifndef OUTER
+#define OUTER
+#include "noheaderguard-a.h"
+#endif

gcc/testsuite/c-c++-common/cpp/noheaderguard.c

@@ -0,0 +1,9 @@
+/* { dg-do preprocess }  */
+/* { dg-additional-options -fno-header-guard-opt }  */
+/* Check header guard optimization is disabled.  */
+
+#include "noheaderguard-b.h"
+#include "noheaderguard-b.h"
+#include "noheaderguard-a.h"
+
+/* { dg-final { scan-file noheaderguard.i {# [0-9]* "[^\n]*noheaderguard.c"\n\n*# [0-9]* "[^\n]*noheaderguard-b.h" 1\n\n*# [0-9]* "[^\n]*noheaderguard-a.h" 1\n\n*# [0-9]* "[^\n]*noheaderguard-b.h" 2\n\n*# [0-9]* "[^\n]*noheaderguard.c" 2\n\n*# [0-9]* "[^\n]*noheaderguard-b.h" 1\n\n*# [0-9]* "[^\n]*noheaderguard.c" 2\n\n*# [0-9]* "[^\n]*noheaderguard-a.h" 1\n\n*# [0-9]* "[^\n]*noheaderguard.c" 2\n} } } */

gcc/testsuite/g++.dg/modules/noheaderguard-1_a.H

@@ -0,0 +1,5 @@
+// { dg-additional-options -fmodule-header }
+
+#ifndef OUTER
+#define OUTER
+#endif

gcc/testsuite/g++.dg/modules/noheaderguard-1_b.C

@@ -0,0 +1,7 @@
+// { dg-do preprocess }
+// { dg-additional-options {-fmodules-ts -fno-header-guard-opt} }
+
+#include "noheaderguard-1_a.H"
+#include "noheaderguard-1_a.H"
+
+// { dg-final { scan-file noheaderguard-1_b.i {# [0-9]* "[^\n]*noheaderguard-1_b.C"\n\n*import  "[^\n]*noheaderguard-1_a.H" \[\[__translated\]\];\nimport  "[^\n]*noheaderguard-1_a.H" \[\[__translated\]\];\n} } }

gcc/testsuite/g++.dg/modules/noheaderguard-1_c.C

@@ -0,0 +1,7 @@
+// { dg-do preprocess }
+// { dg-additional-options {-fmodules-ts -fno-header-guard-opt} }
+
+import "noheaderguard-1_a.H";
+#include "noheaderguard-1_a.H"
+
+// { dg-final { scan-file noheaderguard-1_c.i {# [0-9]* "[^\n]*noheaderguard-1_c.C"\n\n*import  "[^\n]*noheaderguard-1_a.H";\nimport  "[^\n]*noheaderguard-1_a.H" \[\[__translated\]\];\n} } }

gcc/testsuite/lib/prune.exp

@@ -48,6 +48,7 @@ proc prune_gcc_output { text } {
     regsub -all "(^|\n)\[^\n\]*: re(compiling|linking)\[^\n\]*" $text "" text
     regsub -all "(^|\n)Please submit.*instructions\[^\n\]*" $text "" text
     regsub -all "(^|\n)\[0-9\]\[0-9\]* errors\." $text "" text
+    regsub -all "(^|\n)THIS IS AN.*MECHANISM!\[^\n\]*" $text "" text
 
     # Diagnostic inclusion stack
     regsub -all "(^|\n)(In file)?\[ \]+included from \[^\n\]*" $text "" text

libcc1/libcp1plugin.cc

@@ -1004,9 +1004,6 @@ plugin_add_using_decl (cc1_plugin::connection *,
   tree identifier = DECL_NAME (target);
   tree tcontext = DECL_CONTEXT (target);
 
-  if (UNSCOPED_ENUM_P (tcontext))
-    tcontext = CP_TYPE_CONTEXT (tcontext);
-
   if (class_member_p)
     {
       tree decl = do_class_using_decl (tcontext, identifier);
@@ -3289,7 +3286,7 @@ plugin_build_call_expr (cc1_plugin::connection *self,
 	koenig_p = true;
       else if (is_overloaded_fn (callable))
 	{
-	  tree fn = get_first_fn (callable);
+	  tree fn = OVL_FIRST (callable);
 	  fn = STRIP_TEMPLATE (fn);
 
 	  if (!DECL_FUNCTION_MEMBER_P (fn)

libcody/README.md

@@ -284,6 +284,18 @@ knowledge.
 
 These set of requests are used for GCC LTO jobserver integration with GNU Make
 
+#### Invoke Command
+
+A command can be invoked with the follow message:
+
+`INVOKE $args`
+
+A successful invocation provides an OK response.  A failed
+invocation's produces an ERROR response.
+
+FIXME: Note for generalization this command needs to indicate which
+files may need transferring to and from a remote build system.
+
 ## Building libCody
 
 Libcody is written in C++11.  (It's a intended for compilers, so

libcody/client.cc

@@ -29,6 +29,7 @@ static Packet (*const responseTable[Detail::RC_HWM])
     &PathnameResponse,
     &OKResponse,
     &IncludeTranslateResponse,
+    &OKResponse,
   };
 
 Client::Client ()
@@ -253,6 +254,19 @@ Packet PathnameResponse (std::vector<std::string> &words)
   return Packet (Client::PC_ERROR, u8"");
 }
 
+// INVOKE $args
+Packet Client::InvokeSubProcess (char const *const *argv, size_t argc)
+{
+  write.BeginLine ();
+  write.AppendWord (u8"INVOKE");
+
+  for(size_t i = 0; i < argc; i++) 
+    write.AppendWord (argv[i]);
+
+  write.EndLine ();
+  return MaybeRequest (Detail::RC_INVOKE);
+}
+
 // OK or ERROR
 Packet OKResponse (std::vector<std::string> &words)
 {

libcody/cody.hh

@@ -198,6 +198,7 @@ enum RequestCode
   RC_MODULE_IMPORT,
   RC_MODULE_COMPILED,
   RC_INCLUDE_TRANSLATE,
+  RC_INVOKE,
   RC_HWM
 };
 
@@ -467,6 +468,17 @@ public:
 		    agent.size (), ident.size ());
   }
 
+public:
+  /// Invoke a sub process
+  /// @param str command args
+  /// @result packet indicating success or error of command
+  Packet InvokeSubProcess (char const *const *argv, size_t argc);
+
+  Packet InvokeSubProcess (std::vector<const char *> &args)
+  {
+    return InvokeSubProcess (args.data (), args.size ());
+  }
+
 public:
   /// Request compiler module repository
   /// @result packet indicating repo
@@ -624,6 +636,10 @@ public:
 				     std::string &module);
   virtual int IncludeTranslateRequest (Server *s, Flags flags,
 				       std::string &include);
+
+public:
+  virtual int InvokeSubProcessRequest (Server *s,
+				       std::vector<std::string> &args);
 };
 
 

libcody/resolver.cc

@@ -203,6 +203,12 @@ int Resolver::IncludeTranslateRequest (Server *s, Flags, std::string &include)
   return 0;
 }
 
+int Resolver::InvokeSubProcessRequest (Server *s, std::vector<std::string> &)
+{
+  s->ErrorResponse ("unimplemented");
+  return 0;
+}
+
 void Resolver::ErrorResponse (Server *server, std::string &&msg)
 {
   server->ErrorResponse (msg);

libcody/server.cc

@@ -28,6 +28,8 @@ static int ModuleCompiledRequest (Server *, Resolver *,
 				  std::vector<std::string> &words);
 static int IncludeTranslateRequest (Server *, Resolver *,
 				     std::vector<std::string> &words);
+static int InvokeSubProcessRequest (Server *, Resolver *,
+				     std::vector<std::string> &words);
 
 namespace {
 using RequestFn = int (Server *, Resolver *, std::vector<std::string> &);
@@ -42,6 +44,7 @@ static RequestPair
     RequestPair {u8"MODULE-IMPORT", ModuleImportRequest},
     RequestPair {u8"MODULE-COMPILED", ModuleCompiledRequest},
     RequestPair {u8"INCLUDE-TRANSLATE", IncludeTranslateRequest},
+    RequestPair {u8"INVOKE", InvokeSubProcessRequest},
   };
 }
 
@@ -262,6 +265,15 @@ int IncludeTranslateRequest (Server *s, Resolver *r,
   return r->IncludeTranslateRequest (s, flags, words[1]);
 }
 
+int InvokeSubProcessRequest (Server *s, Resolver *r,
+			     std::vector<std::string> &args)
+{
+  if (args.size () < 2 || args[1].empty ())
+    return -1;
+
+  return r->InvokeSubProcessRequest (s, args);
+}
+
 void Server::ErrorResponse (char const *error, size_t elen)
 {
   write.BeginLine ();

libcpp/files.c

@@ -803,7 +803,9 @@ is_known_idempotent_file (cpp_reader *pfile, _cpp_file *file, bool import)
 
   /* Skip if the file had a header guard and the macro is defined.
      PCH relies on this appearing before the PCH handler below.  */
-  if (file->cmacro && cpp_macro_p (file->cmacro))
+  if (file->cmacro && cpp_macro_p (file->cmacro)
+      /* Ignore if the idempotency optimization is disabled.  */
+      && (file->pchname || !CPP_OPTION (pfile, no_header_guard_opt)))
     return true;
 
   /* Handle PCH files immediately; don't stack them.  */
@@ -819,6 +821,18 @@ is_known_idempotent_file (cpp_reader *pfile, _cpp_file *file, bool import)
   return false;
 }
 
+/* Mark FILE as a header_unit, if we're spotting idempotency.  */
+
+static void
+maybe_mark_header_unit (cpp_reader *pfile, _cpp_file *file)
+{
+  if (!CPP_OPTION (pfile, no_header_guard_opt))
+    {
+      file->header_unit = +1;
+      _cpp_mark_file_once_only (pfile, file);
+    }
+}
+      
 /* Return TRUE if file has unique contents, so we should read process
    it.  The file's contents must already have been read.  */
 
@@ -927,8 +941,7 @@ _cpp_stack_file (cpp_reader *pfile, _cpp_file *file, include_type type,
 			   strlen (buf), true);
       buffer->to_free = buffer->buf;
 
-      file->header_unit = +1;
-      _cpp_mark_file_once_only (pfile, file);
+      maybe_mark_header_unit (pfile, file);
     }
   else
     {
@@ -983,7 +996,7 @@ _cpp_stack_file (cpp_reader *pfile, _cpp_file *file, include_type type,
   if (decrement)
     pfile->line_table->highest_location--;
 
-  if (file->header_unit <= 0)
+  if (!buf)
     /* Add line map and do callbacks.  */
     _cpp_do_file_change (pfile, LC_ENTER, file->path,
 		       /* With preamble injection, start on line zero,
@@ -1126,8 +1139,8 @@ cpp_find_header_unit (cpp_reader *pfile, const char *name, bool angle,
       file->fd = 0;
     }
 
-  file->header_unit = +1;
-  _cpp_mark_file_once_only (pfile, file);
+  maybe_mark_header_unit (pfile, file);
+
   return file->path;
 }
 

libcpp/include/cpplib.h

@@ -528,6 +528,9 @@ struct cpp_options
   /* True if warn about differences between C++98 and C++11.  */
   bool cpp_warn_cxx11_compat;
 
+  /* True if header file idempotency should not be optimized.  */
+  bool no_header_guard_opt;
+
   /* Dependency generation.  */
   struct
   {