Cherrypick updates from master to stable

gcc.version

@@ -1 +1 @@
-gcc-9-20180729
+gcc-9-20180826

gcc/d/ChangeLog

@@ -1,4 +1,18 @@
+2018-08-29  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* d-target.cc (Target::prefixName): Remove function.
+	(Target::cppParameterType): New function.
+
+2018-08-25  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* Make-lang.in (D_FRONTEND_OBJS): Add iasm.o, iasmgcc.o
+	* lang.opt (fproperty): Remove option.
+	* d-lang.cc (d_handle_option): Remove case for OPT_fproperty.
+	* toir.cc (IRVisitor::visit(ExtAsmStatement)): Rename override to
+	GccAsmStatement.
+
 2018-07-23  Eugene Wissner  <belka@caraus.de>
+
 	* d-lang.cc (d_handle_option): Change function argument to HOST_WIDE_INT.
 	* lang.opt (Walloca-larger-than=, Wno-alloca-larger-than): New options.
 	* opt.texi (Walloca-larger-than=, Wno-alloca-larger-than): Likewise.

gcc/d/Make-lang.in

@@ -94,6 +94,8 @@ D_FRONTEND_OBJS = \
 	d/filename.o \
 	d/func.o \
 	d/hdrgen.o \
+	d/iasm.o \
+	d/iasmgcc.o \
 	d/identifier.o \
 	d/imphint.o \
 	d/init.o \

gcc/d/d-builtins.cc

@@ -430,12 +430,16 @@ d_init_versions (void)
     VersionCondition::addPredefinedGlobalIdent ("D_Coverage");
   if (flag_pic)
     VersionCondition::addPredefinedGlobalIdent ("D_PIC");
+
   if (global.params.doDocComments)
     VersionCondition::addPredefinedGlobalIdent ("D_Ddoc");
+
   if (global.params.useUnitTests)
     VersionCondition::addPredefinedGlobalIdent ("unittest");
+
   if (global.params.useAssert)
     VersionCondition::addPredefinedGlobalIdent ("assert");
+
   if (global.params.useArrayBounds == BOUNDSCHECKoff)
     VersionCondition::addPredefinedGlobalIdent ("D_NoBoundsChecks");
 

gcc/d/d-frontend.cc

@@ -428,15 +428,6 @@ CTFloat::hash (real_t r)
 
 /* Implements backend-specific interfaces used by the frontend.  */
 
-/* Semantically analyze AsmStatement where SC is the scope.  */
-
-Statement *
-asmSemantic (AsmStatement *s, Scope *sc)
-{
-  sc->func->hasReturnExp |= 8;
-  return s;
-}
-
 /* Determine return style of function - whether in registers or through a
    hidden pointer to the caller's stack.  */
 

gcc/d/d-lang.cc

@@ -514,10 +514,6 @@ d_handle_option (size_t scode, const char *arg, HOST_WIDE_INT value,
       global.params.useIn = value;
       break;
 
-    case OPT_fproperty:
-      global.params.enforcePropertySyntax = value;
-      break;
-
     case OPT_frelease:
       global.params.release = value;
       break;

gcc/d/d-target.cc

@@ -431,13 +431,6 @@ Target::isVectorOpSupported (Type *type, TOK op, Type *)
   return true;
 }
 
-/* Apply any target-specific prefixes based on the given linkage.  */
-
-void
-Target::prefixName (OutBuffer *, LINK)
-{
-}
-
 /* Return the symbol mangling of S for C++ linkage. */
 
 const char *
@@ -469,6 +462,37 @@ Target::cppTypeMangle (Type *type)
     return NULL;
 }
 
+/* Return the type that will really be used for passing the given parameter
+   ARG to an extern(C++) function.  */
+
+Type *
+Target::cppParameterType (Parameter *arg)
+{
+    Type *t = arg->type->merge2 ();
+    if (arg->storageClass & (STCout | STCref))
+      t = t->referenceTo ();
+    else if (arg->storageClass & STClazy)
+      {
+	/* Mangle as delegate.  */
+	Type *td = TypeFunction::create (NULL, t, 0, LINKd);
+	td = TypeDelegate::create (td);
+	t = t->merge2 ();
+      }
+
+    /* Could be a va_list, which we mangle as a pointer.  */
+    if (t->ty == Tsarray && Type::tvalist->ty == Tsarray)
+      {
+	Type *tb = t->toBasetype ()->mutableOf ();
+	if (tb == Type::tvalist)
+	  {
+	    tb = t->nextOf ()->pointerTo ();
+	    t = tb->castMod (t->mod);
+	  }
+      }
+
+    return t;
+}
+
 /* Return the default system linkage for the target.  */
 
 LINK