Address Feedback nr.2

Author: Alex B

lld/MachO/ObjC.cpp

@@ -574,8 +574,6 @@ ObjcCategoryMerger::tryGetSymbolAtIsecOffset(const ConcatInputSection *isec,
     Defined *definedSym = cast<Defined>(sym);
     sym = tryFindDefinedOnIsec(definedSym->isec(),
                                definedSym->value + reloc->addend);
-
-    auto *defSym = dyn_cast<Defined>(sym);
   }
 
   return sym;

lld/test/MachO/objc-category-merging-swift.s

@@ -3,11 +3,64 @@
 
 ############ Test merging multiple categories into a single category ############
 ## Apply category merging to swiftc code just make sure we can handle addends
-## and don't erase cateogry names for swift -- in order to not crash
+## 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
+# 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
+; CHECK-MERGE: _$s11SimpleClassAACN
+; CHECK-MERGE:            isa {{.+}} _OBJC_METACLASS_$__TtC11SimpleClass11SimpleClass
+; CHECK-MERGE:     superclass 0x0
+; CHECK-MERGE:          cache 0x0
+; CHECK-MERGE:         vtable 0x0
+; CHECK-MERGE:           data {{.+}} (struct class_ro_t *) Swift class
+; CHECK-MERGE:                     flags 0x80
+; CHECK-MERGE:             instanceStart 8
+; CHECK-MERGE:              instanceSize 8
+; CHECK-MERGE:                  reserved 0x0
+; CHECK-MERGE:                ivarLayout 0x0
+; CHECK-MERGE:                      name {{.+}} _TtC11SimpleClass11SimpleClass
+; CHECK-MERGE:               baseMethods {{.+}} (struct method_list_t *)
+; CHECK-MERGE:                    entsize 24
+; CHECK-MERGE:                      count 3
+; CHECK-MERGE:                       name {{.+}} categoryInstanceMethod
+; CHECK-MERGE:                      types {{.+}} q16@0:8
+; CHECK-MERGE:                        imp _$s11SimpleClassAAC22categoryInstanceMethodSiyFTo
+; CHECK-MERGE:                       name {{.+}} baseClassInstanceMethod
+; CHECK-MERGE:                      types {{.+}} i16@0:8
+; CHECK-MERGE:                        imp _$s11SimpleClassAAC04baseB14InstanceMethods5Int32VyFTo
+; CHECK-MERGE:                       name {{.+}} init
+; CHECK-MERGE:                      types {{.+}} @16@0:8
+; CHECK-MERGE:                        imp _$s11SimpleClassAACABycfcTo
+; CHECK-MERGE:             baseProtocols 0x0
+; CHECK-MERGE:                     ivars 0x0
+; CHECK-MERGE:            weakIvarLayout 0x0
+; CHECK-MERGE:            baseProperties 0x0
+; CHECK-MERGE: Meta Class
+; CHECK-MERGE:            isa 0x0
+; CHECK-MERGE:     superclass 0x0
+; CHECK-MERGE:          cache 0x0
+; CHECK-MERGE:         vtable 0x0
+; CHECK-MERGE:           data {{.+}} (struct class_ro_t *)
+; CHECK-MERGE:                     flags 0x81 RO_META
+; CHECK-MERGE:             instanceStart 40
+; CHECK-MERGE:              instanceSize 40
+; CHECK-MERGE:                  reserved 0x0
+; CHECK-MERGE:                ivarLayout 0x0
+; CHECK-MERGE:                      name {{.+}} _TtC11SimpleClass11SimpleClass
+; CHECK-MERGE:               baseMethods 0x0 (struct method_list_t *)
+; CHECK-MERGE:             baseProtocols 0x0
+; CHECK-MERGE:                     ivars 0x0
+; CHECK-MERGE:            weakIvarLayout 0x0
+; CHECK-MERGE:            baseProperties 0x0
+; CHECK-MERGE: Contents of (__DATA_CONST,__objc_imageinfo) section
+; CHECK-MERGE:   version 0
+; CHECK-MERGE:     flags 0x740 OBJC_IMAGE_HAS_CATEGORY_CLASS_PROPERTIES Swift 5 or later
 
 ;  ================== Generated from Swift: ==================
+;; > xcrun swiftc --version
+;; swift-driver version: 1.109.2 Apple Swift version 6.0 (swiftlang-6.0.0.3.300 clang-1600.0.20.10)
 ;; > xcrun swiftc -S SimpleClass.swift -o SimpleClass.s
 ; import Foundation
 ; @objc class SimpleClass: NSObject {