Address Feedback #5

Author: Alex B

lld/MachO/ObjC.cpp

@@ -489,7 +489,7 @@ class ObjcCategoryMerger {
   InfoCategoryWriter infoCategoryWriter;
   std::vector<ConcatInputSection *> &allInputSections;
   // Map of base class Symbol to list of InfoInputCategory's for it
-  std::map<const Symbol *, std::vector<InfoInputCategory>> categoryMap;
+  DenseMap<const Symbol *, std::vector<InfoInputCategory>> categoryMap;
 
   // Normally, the binary data comes from the input files, but since we're
   // generating binary data ourselves, we use the below array to store it in.
@@ -1064,6 +1064,7 @@ void ObjcCategoryMerger::collectAndValidateCategoriesData() {
              "Failed to get a valid cateogry at __objc_catlit offset");
 
       // We only support ObjC categories (no swift + @objc)
+      // TODO: Support swift + @objc categories also
       if (!categorySym->getName().starts_with(objc::symbol_names::category))
         continue;
 
@@ -1096,14 +1097,14 @@ void ObjcCategoryMerger::generateCatListForNonErasedCategories(
         catListToErasedOffsets) {
 
   // Go through all offsets of all __objc_catlist's that we process and if there
-  // are categories that we didn't process - generate a new __objv_catlist for
+  // are categories that we didn't process - generate a new __objc_catlist for
   // each.
   for (auto &mapEntry : catListToErasedOffsets) {
     ConcatInputSection *catListIsec = mapEntry.first;
     for (uint32_t catListIsecOffset = 0;
          catListIsecOffset < catListIsec->data.size();
          catListIsecOffset += target->wordSize) {
-      // This slot was erased, we can jsut skip it
+      // This slot was erased, we can just skip it
       if (mapEntry.second.count(catListIsecOffset))
         continue;
 

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

@@ -2,12 +2,12 @@
 # RUN: rm -rf %t; split-file %s %t && cd %t
 
 ## Create a dylib to link against(a64_file1.dylib) and merge categories in the main binary (file2_merge_a64.exe)
-# RUN: llvm-mc -filetype=obj -triple=arm64-ios-simulator -o a64_file1.o a64_file1.s
-# RUN: ld64.lld a64_file1.o -o a64_file1.dylib -dylib -arch arm64 -platform_version ios-simulator 14.0 15.0
+# RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos -o a64_file1.o a64_file1.s
+# RUN: %lld -arch arm64 a64_file1.o -o a64_file1.dylib -dylib
 
-# RUN: llvm-mc -filetype=obj -triple=arm64-ios-simulator -o a64_file2.o a64_file2.s
-# RUN: ld64.lld -o a64_file2_no_merge.exe a64_file1.dylib a64_file2.o -arch arm64 -platform_version ios-simulator 14.0 15.0
-# RUN: ld64.lld -o a64_file2_merge.exe -objc_category_merging a64_file1.dylib a64_file2.o -arch arm64 -platform_version ios-simulator 14.0 15.0
+# RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos -o a64_file2.o a64_file2.s
+# RUN: %lld -arch arm64 -o a64_file2_no_merge.exe a64_file1.dylib a64_file2.o
+# 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_merge.exe | FileCheck %s --check-prefixes=MERGE_CATS
@@ -124,7 +124,6 @@ NO_MERGE_CATS-NEXT: 2
 ## void *_objc_empty_cache;
 
 	.section	__TEXT,__text,regular,pure_instructions
-	.ios_version_min 7, 0
 	.p2align	2                               ; -- Begin function -[MyBaseClass baseInstanceMethod]
 "-[MyBaseClass baseInstanceMethod]":    ; @"\01-[MyBaseClass baseInstanceMethod]"
 	.cfi_startproc
@@ -438,7 +437,6 @@ L_OBJC_IMAGE_INFO:
 
 
 	.section	__TEXT,__text,regular,pure_instructions
-	.ios_version_min 7, 0
 	.p2align	2                               ; -- Begin function -[MyBaseClass(Category02) class02InstanceMethod]
 "-[MyBaseClass(Category02) class02InstanceMethod]": ; @"\01-[MyBaseClass(Category02) class02InstanceMethod]"
 	.cfi_startproc

lld/test/MachO/objc-category-merging-extern-class-minimal.s

@@ -2,13 +2,13 @@
 # RUN: rm -rf %t; split-file %s %t && cd %t
 
 ## Create a dylib with a fake base class to link against
-# RUN: llvm-mc -filetype=obj -triple=arm64-ios-simulator -o a64_fakedylib.o a64_fakedylib.s
-# RUN: ld64.lld a64_fakedylib.o -o a64_fakedylib.dylib -dylib -arch arm64 -platform_version ios-simulator 14.0 15.0
+# RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos -o a64_fakedylib.o a64_fakedylib.s
+# RUN: %lld -arch arm64 a64_fakedylib.o -o a64_fakedylib.dylib -dylib
 
 ## Create our main testing dylib - linking against the fake dylib above
-# RUN: llvm-mc -filetype=obj -triple=arm64-ios-simulator -o merge_cat_minimal.o merge_cat_minimal.s
-# RUN: ld64.lld -dylib -o merge_cat_minimal_no_merge.dylib a64_fakedylib.dylib merge_cat_minimal.o -arch arm64 -platform_version ios-simulator 14.0 15.0
-# RUN: ld64.lld -dylib -o merge_cat_minimal_merge.dylib -objc_category_merging a64_fakedylib.dylib merge_cat_minimal.o -arch arm64 -platform_version ios-simulator 14.0 15.0
+# RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos -o merge_cat_minimal.o merge_cat_minimal.s
+# RUN: %lld -arch arm64 -dylib -o merge_cat_minimal_no_merge.dylib a64_fakedylib.dylib merge_cat_minimal.o
+# RUN: %lld -arch arm64 -dylib -o merge_cat_minimal_merge.dylib -objc_category_merging a64_fakedylib.dylib merge_cat_minimal.o
 
 ## Now verify that the flag caused category merging to happen appropriatelly
 # RUN: llvm-objdump --objc-meta-data --macho merge_cat_minimal_no_merge.dylib | FileCheck %s --check-prefixes=NO_MERGE_CATS
@@ -78,7 +78,6 @@ _OBJC_CLASS_$_MyBaseClass:
 ;  ================== Generated from ObjC: ==================
 
 	.section	__TEXT,__text,regular,pure_instructions
-	.ios_version_min 7, 0
 	.p2align	2                               ; -- Begin function -[MyBaseClass(Category01) cat01_InstanceMethod]
 "-[MyBaseClass(Category01) cat01_InstanceMethod]": ; @"\01-[MyBaseClass(Category01) cat01_InstanceMethod]"
 	.cfi_startproc