[pushed] Ojective-C, Darwin : Adjust category superclass ref names (NFC).

Message ID B8BF052C-C67D-4B9B-880D-06A9248FAC8E@sandoe.co.uk
State New
Headers show
Series
  • [pushed] Ojective-C, Darwin : Adjust category superclass ref names (NFC).
Related show

Commit Message

Iain Sandoe Oct. 11, 2020, 10:38 a.m.
Hi,

Make the order of the class and superclass match the metadata
order from clang.  Makes it easier to compare produced meta-
data between implementations.

tested across the Darwin range and on x86_64-linux,
pushed to master
thanks
Iain

gcc/objc/ChangeLog:

	* objc-next-runtime-abi-02.c
	(next_runtime_abi_02_category_decl): Adjust category
	superclass name ordering.
---
 gcc/objc/objc-next-runtime-abi-02.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
2.24.1

Patch

diff --git a/gcc/objc/objc-next-runtime-abi-02.c b/gcc/objc/objc-next-runtime-abi-02.c
index 3a308975325..92ede0325e9 100644
--- a/gcc/objc/objc-next-runtime-abi-02.c
+++ b/gcc/objc/objc-next-runtime-abi-02.c
@@ -980,9 +980,9 @@  next_runtime_abi_02_category_decl (tree klass)
 {
   tree decl;
   char buf[BUFSIZE];
-  snprintf (buf, BUFSIZE, "_OBJC_Category_%s_on_%s",
-	    IDENTIFIER_POINTER (CLASS_SUPER_NAME (klass)),
-	    IDENTIFIER_POINTER (CLASS_NAME (klass)));
+  snprintf (buf, BUFSIZE, "_OBJC_Category_%s_%s",
+	    IDENTIFIER_POINTER (CLASS_NAME (klass)),
+	    IDENTIFIER_POINTER (CLASS_SUPER_NAME (klass)));
   decl = start_var_decl (objc_v2_category_template, buf);
   OBJCMETA (decl, objc_meta, meta_category);
   return decl;