[llvm-branch-commits] [lld] [lld][MachO] Remove -no_objc_relative_method_lists from tests (PR #243254)

Ellis Hoag via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Mon Nov 16 14:48:23 PST 2026


https://github.com/ellishg created https://github.com/llvm/llvm-project/pull/243254

`-objc_relative_method_lists` was enabled by default in https://github.com/llvm/llvm-project/pull/104519, but it left `-no_objc_relative_method_lists` in a bunch of tests. Remove the flag and fix the tests.

LLM assisted

>From a027f403df662a79fa3cd80291f4baaf5edfc48a Mon Sep 17 00:00:00 2001
From: Ellis Hoag <ellishoag at meta.com>
Date: Mon, 16 Nov 2026 14:42:43 -0800
Subject: [PATCH] [lld][MachO] Remove -no_objc_relative_method_lists from tests

---
 lld/MachO/Driver.cpp                          |  9 +--
 lld/test/MachO/objc-category-conflicts.s      | 16 ++---
 .../objc-category-merging-complete-test.s     | 64 +++++++++----------
 ...jc-category-merging-erase-objc-name-test.s |  8 +--
 .../MachO/objc-category-merging-minimal.s     |  8 +--
 lld/test/MachO/objc-category-merging-swift.s  | 10 +--
 6 files changed, 56 insertions(+), 59 deletions(-)

diff --git a/lld/MachO/Driver.cpp b/lld/MachO/Driver.cpp
index c08876a9cb4913..b144592982e0c8 100644
--- a/lld/MachO/Driver.cpp
+++ b/lld/MachO/Driver.cpp
@@ -1362,12 +1362,9 @@ static uint16_t getChainedFixupsPointerFormat() {
 }
 
 static bool shouldEmitRelativeMethodLists(const InputArgList &args) {
-  const Arg *arg = args.getLastArg(OPT_objc_relative_method_lists,
-                                   OPT_no_objc_relative_method_lists);
-  if (arg && arg->getOption().getID() == OPT_objc_relative_method_lists)
-    return true;
-  if (arg && arg->getOption().getID() == OPT_no_objc_relative_method_lists)
-    return false;
+  if (const Arg *arg = args.getLastArg(OPT_objc_relative_method_lists,
+                                       OPT_no_objc_relative_method_lists))
+    return arg->getOption().matches(OPT_objc_relative_method_lists);
 
   // If no flag is specified, enable this on newer versions by default.
   // The min versions is taken from
diff --git a/lld/test/MachO/objc-category-conflicts.s b/lld/test/MachO/objc-category-conflicts.s
index 3fb81d7caf092c..eb4c0adfd9e934 100644
--- a/lld/test/MachO/objc-category-conflicts.s
+++ b/lld/test/MachO/objc-category-conflicts.s
@@ -10,31 +10,31 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos11.0 -I %t %t/cat2.s --defsym MAKE_LOAD_METHOD=1 -o %t/cat2-with-load.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos11.0 -I %t %t/klass.s --defsym MAKE_LOAD_METHOD=1 -o %t/klass-with-load.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos11.0 -I %t %t/klass-with-no-rodata.s -o %t/klass-with-no-rodata.o
-# RUN: %lld -no_objc_relative_method_lists -dylib -lobjc %t/klass.o -o %t/libklass.dylib
+# RUN: %lld -dylib -lobjc %t/klass.o -o %t/libklass.dylib
 
-# RUN: %no-fatal-warnings-lld -no_objc_relative_method_lists --check-category-conflicts -dylib -lobjc %t/klass.o %t/cat1.o %t/cat2.o -o \
+# RUN: %no-fatal-warnings-lld --check-category-conflicts -dylib -lobjc %t/klass.o %t/cat1.o %t/cat2.o -o \
 # RUN:   /dev/null 2>&1 | FileCheck %s --check-prefixes=CATCLS,CATCAT
-# RUN: %no-fatal-warnings-lld -no_objc_relative_method_lists --check-category-conflicts -dylib -lobjc %t/libklass.dylib %t/cat1.o \
+# RUN: %no-fatal-warnings-lld --check-category-conflicts -dylib -lobjc %t/libklass.dylib %t/cat1.o \
 # RUN:   %t/cat2.o -o /dev/null 2>&1 | FileCheck %s --check-prefix=CATCAT
 
-# RUN: %no-fatal-warnings-lld -no_objc_relative_method_lists --check-category-conflicts -dylib -lobjc %t/klass_w_sym.o %t/cat1_w_sym.o %t/cat2_w_sym.o -o \
+# RUN: %no-fatal-warnings-lld --check-category-conflicts -dylib -lobjc %t/klass_w_sym.o %t/cat1_w_sym.o %t/cat2_w_sym.o -o \
 # RUN:   /dev/null 2>&1 | FileCheck %s --check-prefixes=CATCLS_W_SYM,CATCAT_W_SYM
-# RUN: %no-fatal-warnings-lld -no_objc_relative_method_lists --check-category-conflicts -dylib -lobjc %t/libklass.dylib %t/cat1_w_sym.o \
+# RUN: %no-fatal-warnings-lld --check-category-conflicts -dylib -lobjc %t/libklass.dylib %t/cat1_w_sym.o \
 # RUN:   %t/cat2_w_sym.o -o /dev/null 2>&1 | FileCheck %s --check-prefix=CATCAT_W_SYM
 
 ## Check that we don't emit spurious warnings around the +load method while
 ## still emitting the other warnings. Note that we have made separate
 ## `*-with-load.s` files for ease of comparison with ld64; ld64 will not warn
 ## at all if multiple +load methods are present.
-# RUN: %no-fatal-warnings-lld -no_objc_relative_method_lists --check-category-conflicts -dylib -lobjc %t/klass-with-load.o \
+# RUN: %no-fatal-warnings-lld --check-category-conflicts -dylib -lobjc %t/klass-with-load.o \
 # RUN:   %t/cat1-with-load.o %t/cat2-with-load.o -o /dev/null 2>&1 | \
 # RUN:   FileCheck %s --check-prefixes=CATCLS,CATCAT --implicit-check-not '+load'
 
 ## Regression test: Check that we don't crash.
-# RUN: %no-fatal-warnings-lld -no_objc_relative_method_lists --check-category-conflicts -dylib -lobjc %t/klass-with-no-rodata.o -o /dev/null
+# RUN: %no-fatal-warnings-lld --check-category-conflicts -dylib -lobjc %t/klass-with-no-rodata.o -o /dev/null
 
 ## Check that we don't emit any warnings without --check-category-conflicts.
-# RUN: %no-fatal-warnings-lld -no_objc_relative_method_lists -dylib -lobjc %t/klass.o %t/cat1.o %t/cat2.o -o \
+# RUN: %no-fatal-warnings-lld -dylib -lobjc %t/klass.o %t/cat1.o %t/cat2.o -o \
 # RUN:   /dev/null 2>&1 | FileCheck %s --implicit-check-not 'warning' --allow-empty
 
 # CATCLS:      warning: method '+s1' has conflicting definitions:
diff --git a/lld/test/MachO/objc-category-merging-complete-test.s b/lld/test/MachO/objc-category-merging-complete-test.s
index 882c7bef960c7d..85a590ef4d29f4 100644
--- a/lld/test/MachO/objc-category-merging-complete-test.s
+++ b/lld/test/MachO/objc-category-merging-complete-test.s
@@ -7,10 +7,10 @@
 # RUN: %lld -arch arm64 a64_file1.o -o a64_file1.dylib -dylib
 
 # RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos -o a64_file2.o a64_file2.s
-# RUN: %lld -no_objc_relative_method_lists -arch arm64 -o a64_file2_no_merge.exe a64_file1.dylib a64_file2.o
-# RUN: %lld -no_objc_relative_method_lists -arch arm64 -o a64_file2_no_merge_v2.exe a64_file1.dylib a64_file2.o -no_objc_category_merging
-# RUN: %lld -no_objc_relative_method_lists -arch arm64 -o a64_file2_no_merge_v3.exe a64_file1.dylib a64_file2.o -objc_category_merging -no_objc_category_merging
-# RUN: %lld -no_objc_relative_method_lists -arch arm64 -o a64_file2_merge.exe -objc_category_merging a64_file1.dylib a64_file2.o
+# RUN: %lld -arch arm64 -o a64_file2_no_merge.exe a64_file1.dylib a64_file2.o
+# RUN: %lld -arch arm64 -o a64_file2_no_merge_v2.exe a64_file1.dylib a64_file2.o -no_objc_category_merging
+# RUN: %lld -arch arm64 -o a64_file2_no_merge_v3.exe a64_file1.dylib a64_file2.o -objc_category_merging -no_objc_category_merging
+# RUN: %lld -arch arm64 -o a64_file2_merge.exe -objc_category_merging a64_file1.dylib a64_file2.o
 
 # RUN: llvm-objdump --objc-meta-data --macho a64_file2_no_merge.exe | FileCheck %s --check-prefixes=NO_MERGE_CATS
 # RUN: llvm-objdump --objc-meta-data --macho a64_file2_no_merge_v2.exe | FileCheck %s --check-prefixes=NO_MERGE_CATS
@@ -18,7 +18,7 @@
 # RUN: llvm-objdump --objc-meta-data --macho a64_file2_merge.exe | FileCheck %s --check-prefixes=MERGE_CATS
 
 ############ Test merging multiple categories into the base class ############
-# RUN: %lld -no_objc_relative_method_lists -arch arm64 -o a64_file2_merge_into_class.exe -objc_category_merging a64_file1.o a64_file2.o
+# RUN: %lld -arch arm64 -o a64_file2_merge_into_class.exe -objc_category_merging a64_file1.o a64_file2.o
 # RUN: llvm-objdump --objc-meta-data --macho a64_file2_merge_into_class.exe | FileCheck %s --check-prefixes=MERGE_CATS_CLS
 # RUN: llvm-nm a64_file2_merge_into_class.exe | FileCheck %s --check-prefixes=CLS_LIST_NAMES --implicit-check-not='_(Category02|Category03)'
 
@@ -26,35 +26,35 @@
 MERGE_CATS:     __OBJC_$_CATEGORY_MyBaseClass(Category02|Category03)
 MERGE_CATS-NEXT:              name {{.*}} Category02|Category03
 MERGE_CATS:           instanceMethods
-MERGE_CATS-NEXT:           entsize 24
+MERGE_CATS-NEXT:           entsize 12 (relative)
 MERGE_CATS-NEXT:             count 4
 MERGE_CATS-NEXT:              name {{.*}} class02InstanceMethod
 MERGE_CATS-NEXT:             types {{.*}} v16 at 0:8
-MERGE_CATS-NEXT:               imp -[MyBaseClass(Category02) class02InstanceMethod]
+MERGE_CATS-NEXT:               imp {{.*}} -[MyBaseClass(Category02) class02InstanceMethod]
 MERGE_CATS-NEXT:              name {{.*}} myProtocol02Method
 MERGE_CATS-NEXT:             types {{.*}} v16 at 0:8
-MERGE_CATS-NEXT:               imp -[MyBaseClass(Category02) myProtocol02Method]
+MERGE_CATS-NEXT:               imp {{.*}} -[MyBaseClass(Category02) myProtocol02Method]
 MERGE_CATS-NEXT:              name {{.*}} class03InstanceMethod
 MERGE_CATS-NEXT:             types {{.*}} v16 at 0:8
-MERGE_CATS-NEXT:               imp -[MyBaseClass(Category03) class03InstanceMethod]
+MERGE_CATS-NEXT:               imp {{.*}} -[MyBaseClass(Category03) class03InstanceMethod]
 MERGE_CATS-NEXT:              name {{.*}} myProtocol03Method
 MERGE_CATS-NEXT:             types {{.*}} v16 at 0:8
-MERGE_CATS-NEXT:               imp -[MyBaseClass(Category03) myProtocol03Method]
+MERGE_CATS-NEXT:               imp {{.*}} -[MyBaseClass(Category03) myProtocol03Method]
 MERGE_CATS-NEXT:      classMethods {{.*}}
-MERGE_CATS-NEXT:           entsize 24
+MERGE_CATS-NEXT:           entsize 12 (relative)
 MERGE_CATS-NEXT:             count 4
 MERGE_CATS-NEXT:              name {{.*}} class02ClassMethod
 MERGE_CATS-NEXT:             types {{.*}} v16 at 0:8
-MERGE_CATS-NEXT:               imp +[MyBaseClass(Category02) class02ClassMethod]
+MERGE_CATS-NEXT:               imp {{.*}} +[MyBaseClass(Category02) class02ClassMethod]
 MERGE_CATS-NEXT:              name {{.*}} MyProtocol02Prop
 MERGE_CATS-NEXT:             types {{.*}} i16 at 0:8
-MERGE_CATS-NEXT:               imp +[MyBaseClass(Category02) MyProtocol02Prop]
+MERGE_CATS-NEXT:               imp {{.*}} +[MyBaseClass(Category02) MyProtocol02Prop]
 MERGE_CATS-NEXT:              name {{.*}} class03ClassMethod
 MERGE_CATS-NEXT:             types {{.*}} v16 at 0:8
-MERGE_CATS-NEXT:               imp +[MyBaseClass(Category03) class03ClassMethod]
+MERGE_CATS-NEXT:               imp {{.*}} +[MyBaseClass(Category03) class03ClassMethod]
 MERGE_CATS-NEXT:              name {{.*}} MyProtocol03Prop
 MERGE_CATS-NEXT:             types {{.*}} i16 at 0:8
-MERGE_CATS-NEXT:               imp +[MyBaseClass(Category03) MyProtocol03Prop]
+MERGE_CATS-NEXT:               imp {{.*}} +[MyBaseClass(Category03) MyProtocol03Prop]
 MERGE_CATS-NEXT:         protocols
 MERGE_CATS-NEXT:                      count 2
 MERGE_CATS-NEXT:              list[0] {{.*}} (struct protocol_t *)
@@ -104,10 +104,10 @@ MERGE_CATS:        __OBJC_$_CATEGORY_MyBaseClass_$_Category04
 NO_MERGE_CATS-NOT: __OBJC_$_CATEGORY_MyBaseClass(Category02|Category03)
 NO_MERGE_CATS: __OBJC_$_CATEGORY_MyBaseClass_$_Category02
 NO_MERGE_CATS: instanceMethods
-NO_MERGE_CATS-NEXT: 24
+NO_MERGE_CATS-NEXT: entsize 12 (relative)
 NO_MERGE_CATS-NEXT: 2
 NO_MERGE_CATS: classMethods
-NO_MERGE_CATS-NEXT: 24
+NO_MERGE_CATS-NEXT: entsize 12 (relative)
 NO_MERGE_CATS-NEXT: 2
 
 
@@ -124,32 +124,32 @@ MERGE_CATS_CLS-NEXT:                  reserved 0x0
 MERGE_CATS_CLS-NEXT:                ivarLayout 0x0
 MERGE_CATS_CLS-NEXT:                      name {{.*}} MyBaseClass
 MERGE_CATS_CLS-NEXT:               baseMethods {{.*}} (struct method_list_t *)
-MERGE_CATS_CLS-NEXT:            entsize 24
+MERGE_CATS_CLS-NEXT:            entsize 12 (relative)
 MERGE_CATS_CLS-NEXT:              count 8
 MERGE_CATS_CLS-NEXT:               name {{.*}} class02InstanceMethod
 MERGE_CATS_CLS-NEXT:              types {{.*}} v16 at 0:8
-MERGE_CATS_CLS-NEXT:                imp -[MyBaseClass(Category02) class02InstanceMethod]
+MERGE_CATS_CLS-NEXT:                imp {{.*}} -[MyBaseClass(Category02) class02InstanceMethod]
 MERGE_CATS_CLS-NEXT:               name {{.*}} myProtocol02Method
 MERGE_CATS_CLS-NEXT:              types {{.*}} v16 at 0:8
-MERGE_CATS_CLS-NEXT:                imp -[MyBaseClass(Category02) myProtocol02Method]
+MERGE_CATS_CLS-NEXT:                imp {{.*}} -[MyBaseClass(Category02) myProtocol02Method]
 MERGE_CATS_CLS-NEXT:               name {{.*}} class03InstanceMethod
 MERGE_CATS_CLS-NEXT:              types {{.*}} v16 at 0:8
-MERGE_CATS_CLS-NEXT:                imp -[MyBaseClass(Category03) class03InstanceMethod]
+MERGE_CATS_CLS-NEXT:                imp {{.*}} -[MyBaseClass(Category03) class03InstanceMethod]
 MERGE_CATS_CLS-NEXT:               name {{.*}} myProtocol03Method
 MERGE_CATS_CLS-NEXT:              types {{.*}} v16 at 0:8
-MERGE_CATS_CLS-NEXT:                imp -[MyBaseClass(Category03) myProtocol03Method]
+MERGE_CATS_CLS-NEXT:                imp {{.*}} -[MyBaseClass(Category03) myProtocol03Method]
 MERGE_CATS_CLS-NEXT:               name {{.*}} baseInstanceMethod
 MERGE_CATS_CLS-NEXT:              types {{.*}} v16 at 0:8
-MERGE_CATS_CLS-NEXT:                imp -[MyBaseClass baseInstanceMethod]
+MERGE_CATS_CLS-NEXT:                imp {{.*}} -[MyBaseClass baseInstanceMethod]
 MERGE_CATS_CLS-NEXT:               name {{.*}} myProtocol01Method
 MERGE_CATS_CLS-NEXT:              types {{.*}} v16 at 0:8
-MERGE_CATS_CLS-NEXT:                imp -[MyBaseClass myProtocol01Method]
+MERGE_CATS_CLS-NEXT:                imp {{.*}} -[MyBaseClass myProtocol01Method]
 MERGE_CATS_CLS-NEXT:               name {{.*}} MyProtocol01Prop
 MERGE_CATS_CLS-NEXT:              types {{.*}} i16 at 0:8
-MERGE_CATS_CLS-NEXT:                imp -[MyBaseClass MyProtocol01Prop]
+MERGE_CATS_CLS-NEXT:                imp {{.*}} -[MyBaseClass MyProtocol01Prop]
 MERGE_CATS_CLS-NEXT:               name {{.*}} setMyProtocol01Prop:
 MERGE_CATS_CLS-NEXT:              types {{.*}} v20 at 0:8i16
-MERGE_CATS_CLS-NEXT:                imp -[MyBaseClass setMyProtocol01Prop:]
+MERGE_CATS_CLS-NEXT:                imp {{.*}} -[MyBaseClass setMyProtocol01Prop:]
 MERGE_CATS_CLS-NEXT:             baseProtocols {{.*}}
 MERGE_CATS_CLS-NEXT:                       count 3
 MERGE_CATS_CLS-NEXT:               list[0] {{.*}} (struct protocol_t *)
@@ -237,23 +237,23 @@ MERGE_CATS_CLS-NEXT:                  reserved 0x0
 MERGE_CATS_CLS-NEXT:                ivarLayout 0x0
 MERGE_CATS_CLS-NEXT:                      name {{.*}} MyBaseClass
 MERGE_CATS_CLS-NEXT:               baseMethods {{.*}} (struct method_list_t *)
-MERGE_CATS_CLS-NEXT:            entsize 24
+MERGE_CATS_CLS-NEXT:            entsize 12 (relative)
 MERGE_CATS_CLS-NEXT:              count 5
 MERGE_CATS_CLS-NEXT:               name {{.*}} class02ClassMethod
 MERGE_CATS_CLS-NEXT:              types {{.*}} v16 at 0:8
-MERGE_CATS_CLS-NEXT:                imp +[MyBaseClass(Category02) class02ClassMethod]
+MERGE_CATS_CLS-NEXT:                imp {{.*}} +[MyBaseClass(Category02) class02ClassMethod]
 MERGE_CATS_CLS-NEXT:               name {{.*}} MyProtocol02Prop
 MERGE_CATS_CLS-NEXT:              types {{.*}} i16 at 0:8
-MERGE_CATS_CLS-NEXT:                imp +[MyBaseClass(Category02) MyProtocol02Prop]
+MERGE_CATS_CLS-NEXT:                imp {{.*}} +[MyBaseClass(Category02) MyProtocol02Prop]
 MERGE_CATS_CLS-NEXT:               name {{.*}} class03ClassMethod
 MERGE_CATS_CLS-NEXT:              types {{.*}} v16 at 0:8
-MERGE_CATS_CLS-NEXT:                imp +[MyBaseClass(Category03) class03ClassMethod]
+MERGE_CATS_CLS-NEXT:                imp {{.*}} +[MyBaseClass(Category03) class03ClassMethod]
 MERGE_CATS_CLS-NEXT:               name {{.*}} MyProtocol03Prop
 MERGE_CATS_CLS-NEXT:              types {{.*}} i16 at 0:8
-MERGE_CATS_CLS-NEXT:                imp +[MyBaseClass(Category03) MyProtocol03Prop]
+MERGE_CATS_CLS-NEXT:                imp {{.*}} +[MyBaseClass(Category03) MyProtocol03Prop]
 MERGE_CATS_CLS-NEXT:               name {{.*}} baseClassMethod
 MERGE_CATS_CLS-NEXT:              types {{.*}} v16 at 0:8
-MERGE_CATS_CLS-NEXT:                imp +[MyBaseClass baseClassMethod]
+MERGE_CATS_CLS-NEXT:                imp {{.*}} +[MyBaseClass baseClassMethod]
 MERGE_CATS_CLS-NEXT:             baseProtocols {{.*}}
 MERGE_CATS_CLS-NEXT:                       count 3
 MERGE_CATS_CLS-NEXT:               list[0] {{.*}} (struct protocol_t *)
diff --git a/lld/test/MachO/objc-category-merging-erase-objc-name-test.s b/lld/test/MachO/objc-category-merging-erase-objc-name-test.s
index bc0b27d198795e..e8009feaff90a7 100644
--- a/lld/test/MachO/objc-category-merging-erase-objc-name-test.s
+++ b/lld/test/MachO/objc-category-merging-erase-objc-name-test.s
@@ -7,7 +7,7 @@
 ; RUN: mkdir -p %t.dir
 
 ; RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos -o %t.dir/erase-objc-name.o %s
-; RUN: %lld -no_objc_relative_method_lists -arch arm64 -dylib -o %t.dir/erase-objc-name.dylib %t.dir/erase-objc-name.o -objc_category_merging
+; RUN: %lld -arch arm64 -dylib -o %t.dir/erase-objc-name.dylib %t.dir/erase-objc-name.o -objc_category_merging
 ; RUN: llvm-objdump --objc-meta-data --macho %t.dir/erase-objc-name.dylib | FileCheck %s --check-prefixes=MERGE_CATS
 
 ; === Check merge categories enabled ===
@@ -30,14 +30,14 @@
 ; MERGE_CATS-NEXT:                ivarLayout {{.*}}
 ; MERGE_CATS-NEXT:                      name {{.*}} MyBaseClass
 ; MERGE_CATS-NEXT:               baseMethods {{.*}} (struct method_list_t *)
-; MERGE_CATS-NEXT:             entsize 24
+; MERGE_CATS-NEXT:             entsize 12 (relative)
 ; MERGE_CATS-NEXT:               count 2
 ; MERGE_CATS-NEXT:                name {{.*}} getValue
 ; MERGE_CATS-NEXT:               types {{.*}} i16 at 0:8
-; MERGE_CATS-NEXT:                 imp -[MyBaseClass(MyTestProtocol) getValue]
+; MERGE_CATS-NEXT:                 imp {{.*}} -[MyBaseClass(MyTestProtocol) getValue]
 ; MERGE_CATS-NEXT:                name {{.*}} baseInstanceMethod
 ; MERGE_CATS-NEXT:               types {{.*}} v16 at 0:8
-; MERGE_CATS-NEXT:                 imp -[MyBaseClass baseInstanceMethod]
+; MERGE_CATS-NEXT:                 imp {{.*}} -[MyBaseClass baseInstanceMethod]
 ; MERGE_CATS-NEXT:             baseProtocols {{.*}}
 ; MERGE_CATS-NEXT:                       count 1
 ; MERGE_CATS-NEXT:                list[0] {{.*}} (struct protocol_t *)
diff --git a/lld/test/MachO/objc-category-merging-minimal.s b/lld/test/MachO/objc-category-merging-minimal.s
index b0176aebba8f4e..e1e396fa1487e0 100644
--- a/lld/test/MachO/objc-category-merging-minimal.s
+++ b/lld/test/MachO/objc-category-merging-minimal.s
@@ -29,7 +29,7 @@
 
 ############ Test merging swift category into the base class ############
 # RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos -o MyBaseClassSwiftExtension.o MyBaseClassSwiftExtension.s
-# RUN: %lld -no_objc_relative_method_lists -arch arm64 -dylib -o merge_base_class_swift_minimal_yes_merge.dylib -objc_category_merging MyBaseClassSwiftExtension.o merge_base_class_minimal.o
+# RUN: %lld -arch arm64 -dylib -o merge_base_class_swift_minimal_yes_merge.dylib -objc_category_merging MyBaseClassSwiftExtension.o merge_base_class_minimal.o
 # RUN: llvm-objdump --objc-meta-data --macho merge_base_class_swift_minimal_yes_merge.dylib | FileCheck %s --check-prefixes=YES_MERGE_INTO_BASE_SWIFT
 
 ############ Test merging skipped due to invalid category name ############
@@ -130,14 +130,14 @@ YES_MERGE_INTO_BASE-NEXT: imp {{.*}} -[MyBaseClass baseInstanceMethod]
 YES_MERGE_INTO_BASE_SWIFT: _OBJC_CLASS_$_MyBaseClass
 YES_MERGE_INTO_BASE_SWIFT-NEXT: _OBJC_METACLASS_$_MyBaseClass
 YES_MERGE_INTO_BASE_SWIFT: baseMethods
-YES_MERGE_INTO_BASE_SWIFT-NEXT: entsize 24
+YES_MERGE_INTO_BASE_SWIFT-NEXT: entsize 12 (relative)
 YES_MERGE_INTO_BASE_SWIFT-NEXT: count 2
 YES_MERGE_INTO_BASE_SWIFT-NEXT: name {{.*}} swiftMethod
 YES_MERGE_INTO_BASE_SWIFT-NEXT: types {{.*}} v16 at 0:8
-YES_MERGE_INTO_BASE_SWIFT-NEXT: imp _$sSo11MyBaseClassC0abC14SwiftExtensionE11swiftMethodyyFTo
+YES_MERGE_INTO_BASE_SWIFT-NEXT: imp {{.*}} _$sSo11MyBaseClassC0abC14SwiftExtensionE11swiftMethodyyFTo
 YES_MERGE_INTO_BASE_SWIFT-NEXT: name {{.*}} baseInstanceMethod
 YES_MERGE_INTO_BASE_SWIFT-NEXT: types {{.*}} v16 at 0:8
-YES_MERGE_INTO_BASE_SWIFT-NEXT: imp -[MyBaseClass baseInstanceMethod]
+YES_MERGE_INTO_BASE_SWIFT-NEXT: imp {{.*}} -[MyBaseClass baseInstanceMethod]
 
 
 #--- a64_fakedylib.s
diff --git a/lld/test/MachO/objc-category-merging-swift.s b/lld/test/MachO/objc-category-merging-swift.s
index 61711ee7fd1389..381992f6ff11fd 100644
--- a/lld/test/MachO/objc-category-merging-swift.s
+++ b/lld/test/MachO/objc-category-merging-swift.s
@@ -5,7 +5,7 @@
 ## Apply category merging to swiftc code just make sure we can handle addends
 ## and don't erase category names for swift -- in order to not crash
 # RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos -o cat_swift.o %s
-# RUN: %lld -arch arm64 -dylib -o cat_swift.dylib cat_swift.o -objc_category_merging -no_objc_relative_method_lists
+# RUN: %lld -arch arm64 -dylib -o cat_swift.dylib cat_swift.o -objc_category_merging
 # RUN: llvm-objdump --objc-meta-data --macho cat_swift.dylib | FileCheck %s --check-prefixes=CHECK-MERGE
 
 ; CHECK-MERGE:      Contents of (__DATA_CONST,__objc_classlist) section
@@ -22,17 +22,17 @@
 ; CHECK-MERGE-NEXT:                ivarLayout 0x0
 ; CHECK-MERGE-NEXT:                      name {{.+}} _TtC11SimpleClass11SimpleClass
 ; CHECK-MERGE-NEXT:               baseMethods {{.+}} (struct method_list_t *)
-; CHECK-MERGE-NEXT:                    entsize 24
+; CHECK-MERGE-NEXT:                    entsize 12 (relative)
 ; CHECK-MERGE-NEXT:                      count 3
 ; CHECK-MERGE-NEXT:                       name {{.+}} categoryInstanceMethod
 ; CHECK-MERGE-NEXT:                      types {{.+}} q16 at 0:8
-; CHECK-MERGE-NEXT:                        imp _$s11SimpleClassAAC22categoryInstanceMethodSiyFTo
+; CHECK-MERGE-NEXT:                        imp {{.*}} _$s11SimpleClassAAC22categoryInstanceMethodSiyFTo
 ; CHECK-MERGE-NEXT:                       name {{.+}} baseClassInstanceMethod
 ; CHECK-MERGE-NEXT:                      types {{.+}} i16 at 0:8
-; CHECK-MERGE-NEXT:                        imp _$s11SimpleClassAAC04baseB14InstanceMethods5Int32VyFTo
+; CHECK-MERGE-NEXT:                        imp {{.*}} _$s11SimpleClassAAC04baseB14InstanceMethods5Int32VyFTo
 ; CHECK-MERGE-NEXT:                       name {{.+}} init
 ; CHECK-MERGE-NEXT:                      types {{.+}} @16 at 0:8
-; CHECK-MERGE-NEXT:                        imp _$s11SimpleClassAACABycfcTo
+; CHECK-MERGE-NEXT:                        imp {{.*}} _$s11SimpleClassAACABycfcTo
 ; CHECK-MERGE-NEXT:             baseProtocols 0x0
 ; CHECK-MERGE-NEXT:                     ivars 0x0
 ; CHECK-MERGE-NEXT:            weakIvarLayout 0x0



More information about the llvm-branch-commits mailing list