From 1174b08b140d1fed6012d7dcf66165fabd49b7e5 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Sat, 10 Oct 2020 22:21:05 +0100 Subject: [PATCH] Ojective-C, Darwin : Adjust category superclass ref names (NFC). Make the order of the class and superclass match the metadata order from clang. Makes it easier to compare produced meta- data between implementations. 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(-) 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; -- 2.30.2