diff mbox series

[committed] d: Fix FAIL in gdc.dg/runnable.d on X32 targets (PR94609)

Message ID 20200419080954.16398-1-ibuclaw@gdcproject.org
State New
Headers show
Series [committed] d: Fix FAIL in gdc.dg/runnable.d on X32 targets (PR94609) | expand

Commit Message

Iain Buclaw April 19, 2020, 8:09 a.m. UTC
Hi,

Patch fixes test failure seen on X32 where a nested struct was passed in
registers, rather than via invisible reference.  Now, all non-POD
structs are passed by invisible reference, not just those with a
user-defined copy constructor/destructor.

Bootstrapped and regression tested on x86_64-linux-gnu with
--target_board=unix\{,-m32,-mx32\}.  Committed to mainline.

Regards
Iain

---
gcc/d/ChangeLog:

	PR d/94609
	* d-codegen.cc (argument_reference_p): Don't check TREE_ADDRESSABLE.
	(type_passed_as): Build reference type if TREE_ADDRESSABLE.
	* d-convert.cc (convert_for_argument): Build explicit TARGET_EXPR if
	needed for arguments passed by invisible reference.
	* types.cc (TypeVisitor::visit (TypeStruct *)): Mark all structs that
	are not POD as TREE_ADDRESSABLE.
---
 gcc/d/d-codegen.cc |  6 +-----
 gcc/d/d-convert.cc | 15 +++++++++++++++
 gcc/d/types.cc     |  2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/gcc/d/d-codegen.cc b/gcc/d/d-codegen.cc
index 66af2b4da30..8dc1ab264f8 100644
--- a/gcc/d/d-codegen.cc
+++ b/gcc/d/d-codegen.cc
@@ -180,10 +180,6 @@  argument_reference_p (Parameter *arg)
   if (tb->ty == Treference || arg->storageClass & (STCout | STCref))
     return true;
 
-  tree type = build_ctype (arg->type);
-  if (TREE_ADDRESSABLE (type))
-    return true;
-
   return false;
 }
 
@@ -211,7 +207,7 @@  type_passed_as (Parameter *arg)
   tree type = build_ctype (arg->type);
 
   /* Parameter is passed by reference.  */
-  if (argument_reference_p (arg))
+  if (TREE_ADDRESSABLE (type) || argument_reference_p (arg))
     return build_reference_type (type);
 
   return type;
diff --git a/gcc/d/d-convert.cc b/gcc/d/d-convert.cc
index 533bbabd168..9ee149b8386 100644
--- a/gcc/d/d-convert.cc
+++ b/gcc/d/d-convert.cc
@@ -677,6 +677,21 @@  convert_for_argument (tree expr, Parameter *arg)
       /* Front-end shouldn't automatically take the address.  */
       return convert (type_passed_as (arg), build_address (expr));
     }
+  else if (TREE_ADDRESSABLE (TREE_TYPE (expr)))
+    {
+      /* Type is a struct passed by invisible reference.  */
+      Type *t = arg->type->toBasetype ();
+      gcc_assert (t->ty == Tstruct);
+      StructDeclaration *sd = ((TypeStruct *) t)->sym;
+
+      /* Nested structs also have ADDRESSABLE set, but if the type has
+	 neither a copy constructor nor a destructor available, then we
+	 need to take care of copying its value before passing it.  */
+      if (!sd->postblit && !sd->dtor)
+	expr = force_target_expr (expr);
+
+      return convert (type_passed_as (arg), build_address (expr));
+    }
 
   return expr;
 }
diff --git a/gcc/d/types.cc b/gcc/d/types.cc
index e0e770af325..f6ae5740f01 100644
--- a/gcc/d/types.cc
+++ b/gcc/d/types.cc
@@ -915,7 +915,7 @@  public:
     /* For structs with a user defined postblit or a destructor,
        also set TREE_ADDRESSABLE on the type and all variants.
        This will make the struct be passed around by reference.  */
-    if (t->sym->postblit || t->sym->dtor)
+    if (!t->sym->isPOD ())
       {
 	for (tree tv = t->ctype; tv != NULL_TREE; tv = TYPE_NEXT_VARIANT (tv))
 	  TREE_ADDRESSABLE (tv) = 1;