Update to dmd master 20180918

gcc/d/ChangeLog

@@ -1,3 +1,9 @@
+2018-09-18  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* d-lang.cc (deps_write): Use toChars accessor to get module path.
+	* decl.cc (get_symbol_decl): Use get_identifier_with_length to get
+	mangle override identifier node.
+
 2018-09-10  Iain Buclaw  <ibuclaw@gdcproject.org>
 
 	* d-lang.cc (d_init_options): Set-up global.params.argv0 as D array.

gcc/d/d-lang.cc

@@ -175,7 +175,7 @@ deps_write (Module *module, OutBuffer *buffer, unsigned colmax = 72)
     }
   else
     {
-      str = module->objfile->name->str;
+      str = module->objfile->name.toChars ();
       size = strlen (str);
     }
 
@@ -189,7 +189,7 @@ deps_write (Module *module, OutBuffer *buffer, unsigned colmax = 72)
   {
     Module *depmod = modlist.pop ();
 
-    str = depmod->srcfile->name->str;
+    str = depmod->srcfile->name.toChars ();
     size = strlen (str);
 
     /* Skip dependencies that have already been written.  */
@@ -256,7 +256,7 @@ deps_write (Module *module, OutBuffer *buffer, unsigned colmax = 72)
       Module *m = phonylist[i];
 
       buffer->writenl ();
-      buffer->writestring (m->srcfile->name->str);
+      buffer->writestring (m->srcfile->name.toChars ());
       buffer->writestring (":\n");
     }
 }

gcc/d/decl.cc

@@ -1103,8 +1103,12 @@ get_symbol_decl (Declaration *decl)
     {
       tree mangled_name;
 
-      if (decl->mangleOverride)
-	mangled_name = get_identifier (decl->mangleOverride);
+      if (decl->mangleOverride.length)
+	{
+	  mangled_name =
+	    get_identifier_with_length (decl->mangleOverride.ptr,
+					decl->mangleOverride.length);
+	}
       else
 	mangled_name = get_identifier (mangle_decl (decl));
 

gcc/d/dmd/constfold.d

@@ -389,8 +389,6 @@ UnionExp Div(const ref Loc loc, Type type, Expression e1, Expression e2)
     if (type.isfloating())
     {
         auto c = complex_t(CTFloat.zero);
-        //e1.type.print();
-        //e2.type.print();
         if (e2.type.isreal())
         {
             if (e1.type.isreal())

gcc/d/dmd/cppmangle.d

@@ -1045,7 +1045,7 @@ private final class CppMangleVisitor : Visitor
             }
             if (!substitute(s))
             {
-                cpp_mangle_name(s, t.isConst());
+                cpp_mangle_name(s, false);
             }
         }
         if (t.isConst())
@@ -1091,7 +1091,7 @@ private final class CppMangleVisitor : Visitor
 
         if (!substitute(t.sym))
         {
-            cpp_mangle_name(t.sym, t.isConst());
+            cpp_mangle_name(t.sym, false);
         }
         if (t.isConst())
             append(null);  // C++ would have an extra type here

gcc/d/dmd/dcast.d

@@ -2757,9 +2757,6 @@ Lagain:
         t2 = Type.basic[ty2];
         e1 = e1.castTo(sc, t1);
         e2 = e2.castTo(sc, t2);
-        //printf("after typeCombine():\n");
-        //print();
-        //printf("ty = %d, ty1 = %d, ty2 = %d\n", ty, ty1, ty2);
         goto Lret;
     }
 
@@ -3322,7 +3319,6 @@ Lret:
             printf("\tt2 = %s\n", e2.type.toChars());
         printf("\ttype = %s\n", t.toChars());
     }
-    //print();
     return true;
 
 Lt1:

gcc/d/dmd/declaration.d

@@ -290,7 +290,7 @@ extern (C++) abstract class Declaration : Dsymbol
     int inuse;          // used to detect cycles
 
     // overridden symbol with pragma(mangle, "...")
-    const(char)* mangleOverride;
+    const(char)[] mangleOverride;
 
     final extern (D) this(Identifier id)
     {

gcc/d/dmd/declaration.h

@@ -126,7 +126,7 @@ class Declaration : public Dsymbol
     Prot protection;
     LINK linkage;
     int inuse;                  // used to detect cycles
-    const char *mangleOverride;      // overridden symbol with pragma(mangle, "...")
+    DArray<const char> mangleOverride;      // overridden symbol with pragma(mangle, "...")
 
     const char *kind() const;
     d_uns64 size(const Loc &loc);

gcc/d/dmd/dmangle.d

@@ -530,11 +530,6 @@ public:
     /************************************************************
      * Write length prefixed string to buf.
      */
-    void toBuffer(const(char)* id, Dsymbol s)
-    {
-        toBuffer(id[0 .. strlen(id)], s);
-    }
-
     extern (D) void toBuffer(const(char)[] id, Dsymbol s)
     {
         const len = id.length;
@@ -867,7 +862,7 @@ public:
         if (s.ident)
             mangleIdentifier(s.ident, s);
         else
-            toBuffer(s.toChars(), s);
+            toBuffer(s.toString(), s);
         //printf("Dsymbol.mangle() %s = %s\n", s.toChars(), id);
     }
 

gcc/d/dmd/dmodule.d

@@ -572,23 +572,29 @@ extern (C++) final class Module : Package
      */
     File* setOutfile(const(char)* name, const(char)* dir, const(char)* arg, const(char)* ext)
     {
-        const(char)* docfilename;
+        return setOutfile(name.toDString(), dir.toDString(), arg.toDString(), ext.toDString());
+    }
+
+    /// Ditto
+    extern(D) File* setOutfile(const(char)[] name, const(char)[] dir, const(char)[] arg, const(char)[] ext)
+    {
+        const(char)[] docfilename;
         if (name)
         {
             docfilename = name;
         }
         else
         {
-            const(char)* argdoc;
+            const(char)[] argdoc;
             OutBuffer buf;
-            if (!strcmp(arg, "__stdin.d"))
+            if (arg == "__stdin.d")
             {
                 version (Posix)
                     import core.sys.posix.unistd : getpid;
                 else version (Windows)
                     import core.sys.windows.windows : getpid = GetCurrentProcessId;
                 buf.printf("__stdin_%d.d", getpid());
-                arg = buf.peekString();
+                arg = buf.peekSlice();
             }
             if (global.params.preservePaths)
                 argdoc = arg;
@@ -602,9 +608,9 @@ extern (C++) final class Module : Package
             }
             docfilename = FileName.forceExt(argdoc, ext);
         }
-        if (FileName.equals(docfilename, srcfile.name.str))
+        if (FileName.equals(docfilename, srcfile.name.toString()))
         {
-            error("source file and output file have same name '%s'", srcfile.name.str);
+            error("source file and output file have same name '%s'", srcfile.name.toChars());
             fatal();
         }
         return new File(docfilename);