Hi,

This patch adjusts the field names of delegate csts constructed inline.
Doesn't change anything in the code generation or ABI, but makes it
consistent with regular delegates as names would match up when
inspecting tree dumps.

Regression tested on x86_64-linux-gnu and committed to mainline.

Regards,
Iain.

---
gcc/d/ChangeLog:

        * d-codegen.cc (build_delegate_cst): Give anonymous delegate field
        names same as per ABI spec.
---
 gcc/d/d-codegen.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcc/d/d-codegen.cc b/gcc/d/d-codegen.cc
index 3fd4bee58f6..d02da1f81e3 100644
--- a/gcc/d/d-codegen.cc
+++ b/gcc/d/d-codegen.cc
@@ -419,8 +419,8 @@ build_delegate_cst (tree method, tree object, Type *type)
     {
       /* Convert a function method into an anonymous delegate.  */
       ctype = make_struct_type ("delegate()", 2,
-                               get_identifier ("object"), TREE_TYPE (object),
-                               get_identifier ("func"), TREE_TYPE (method));
+                               get_identifier ("ptr"), TREE_TYPE (object),
+                               get_identifier ("funcptr"), TREE_TYPE (method));
       TYPE_DELEGATE (ctype) = 1;
     }
 
-- 
2.34.1

Reply via email to