fix(macos): add more ignore for massif tests

.github/macos-14-expected.txt

@@ -253,47 +253,15 @@ drd/tests/timed_mutex                    (stderr)
 drd/tests/trylock                        (stderr)
 drd/tests/unit_bitmap                    (stderr)
 drd/tests/unit_vc                        (stderr)
-massif/tests/alloc-fns-A                 (post)
-massif/tests/alloc-fns-B                 (post)
-massif/tests/basic                       (post)
-massif/tests/basic2                      (post)
 massif/tests/big-alloc                   (post)
 massif/tests/bug469146                   (post)
 massif/tests/culling1                    (stderr)
-massif/tests/culling2                    (stderr)
 massif/tests/custom_alloc                (stderr)
 massif/tests/custom_alloc                (post)
-massif/tests/deep-A                      (post)
-massif/tests/deep-B                      (stderr)
-massif/tests/deep-B                      (post)
-massif/tests/deep-C                      (stderr)
-massif/tests/deep-C                      (post)
-massif/tests/deep-D                      (post)
-massif/tests/ignored                     (post)
-massif/tests/ignoring                    (post)
 massif/tests/inlinfomalloc               (post)
-massif/tests/insig                       (post)
-massif/tests/long-names                  (post)
-massif/tests/long-time                   (post)
 massif/tests/mmapunmap                   (post)
-massif/tests/new-cpp                     (post)
-massif/tests/null                        (post)
-massif/tests/one                         (post)
 massif/tests/overloaded-new              (post)
 massif/tests/pages_as_heap               (stderr)
-massif/tests/peak                        (post)
-massif/tests/peak2                       (stderr)
-massif/tests/peak2                       (post)
-massif/tests/realloc                     (stderr)
-massif/tests/realloc                     (post)
-massif/tests/thresholds_0_0              (post)
-massif/tests/thresholds_0_10             (post)
-massif/tests/thresholds_10_0             (post)
-massif/tests/thresholds_10_10            (post)
-massif/tests/thresholds_5_0              (post)
-massif/tests/thresholds_5_10             (post)
-massif/tests/zero1                       (post)
-massif/tests/zero2                       (post)
 dhat/tests/acc                           (stderr)
 dhat/tests/basic                         (stderr)
 dhat/tests/big                           (stderr)

.github/macos-26-expected.txt

@@ -387,47 +387,20 @@ drd/tests/timed_mutex                    (stderr)
 drd/tests/trylock                        (stderr)
 drd/tests/unit_bitmap                    (stderr)
 drd/tests/unit_vc                        (stderr)
-massif/tests/alloc-fns-A                 (post)
-massif/tests/alloc-fns-B                 (post)
-massif/tests/basic                       (post)
-massif/tests/basic2                      (post)
 massif/tests/big-alloc                   (post)
 massif/tests/bug469146                   (post)
 massif/tests/culling1                    (stderr)
-massif/tests/culling2                    (stderr)
 massif/tests/custom_alloc                (stderr)
 massif/tests/custom_alloc                (post)
-massif/tests/deep-A                      (post)
-massif/tests/deep-B                      (stderr)
-massif/tests/deep-B                      (post)
-massif/tests/deep-C                      (stderr)
-massif/tests/deep-C                      (post)
-massif/tests/deep-D                      (post)
-massif/tests/ignored                     (post)
-massif/tests/ignoring                    (post)
 massif/tests/inlinfomalloc               (post)
 massif/tests/insig                       (post)
-massif/tests/long-names                  (post)
-massif/tests/long-time                   (post)
 massif/tests/mmapunmap                   (post)
-massif/tests/new-cpp                     (post)
-massif/tests/null                        (post)
 massif/tests/one                         (post)
 massif/tests/overloaded-new              (post)
 massif/tests/pages_as_heap               (stderr)
 massif/tests/peak                        (post)
 massif/tests/peak2                       (stderr)
 massif/tests/peak2                       (post)
-massif/tests/realloc                     (stderr)
-massif/tests/realloc                     (post)
-massif/tests/thresholds_0_0              (post)
-massif/tests/thresholds_0_10             (post)
-massif/tests/thresholds_10_0             (post)
-massif/tests/thresholds_10_10            (post)
-massif/tests/thresholds_5_0              (post)
-massif/tests/thresholds_5_10             (post)
-massif/tests/zero1                       (post)
-massif/tests/zero2                       (post)
 dhat/tests/acc                           (stderr)
 dhat/tests/basic                         (stderr)
 dhat/tests/big                           (stderr)

massif/tests/alloc-fns-A.post.exp

@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./alloc-fns
-Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --massif-out-file=massif.out --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook --ignore-fn=get_or_create_key_element --alloc-fn=_xpc_malloc --ignore-fn=_xpc_dictionary_insert --ignore-fn=map_images_nolock --ignore-fn=allocBuckets(void*, unsigned int) --ignore-fn=realizeClass(objc_class*) --ignore-fn=_NXHashRehashToCapacity --ignore-fn=NXCreateHashTableFromZone --ignore-fn=NXCreateMapTableFromZone --ignore-fn=NXHashInsert --ignore-fn=add_class_to_loadable_list --ignore-fn=class_createInstance --ignore-fn=xpc_string_create --alloc-fn=strdup --alloc-fn=_xpc_calloc --ignore-fn=xpc_array_create
+Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --massif-out-file=massif.out --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook --ignore-fn=get_or_create_key_element --alloc-fn=_xpc_malloc --ignore-fn=_xpc_dictionary_insert --ignore-fn=map_images_nolock --ignore-fn=allocBuckets(void*, unsigned int) --ignore-fn=realizeClass(objc_class*) --ignore-fn=_NXHashRehashToCapacity --ignore-fn=NXCreateHashTableFromZone --ignore-fn=NXCreateMapTableFromZone --ignore-fn=NXHashInsert --ignore-fn=add_class_to_loadable_list --ignore-fn=class_createInstance --ignore-fn=xpc_string_create --alloc-fn=strdup --alloc-fn=_xpc_calloc --ignore-fn=xpc_array_create --ignore-fn=realizeClassWithoutSwift(objc_class*, objc_class*) --ignore-fn=allocBuckets(unsigned int) --alloc-fn=_xpc_alloc_typed --ignore-fn=_xpc_array_create --alloc-fn=_xpc_strdup --ignore-fn=NXCreateMapTable --ignore-fn=NXCreateHashTable --ignore-fn=id2data(objc_object*, SyncKind, usage) --ignore-fn=class_rw_t::extAlloc(class_ro_t const*, bool) --ignore-fn=_fetchInitializingClassList(bool) --ignore-fn=objc::SafeRanges::add(unsigned long, unsigned long) --ignore-fn=cache_t::insert(objc_selector*, void (*)(), objc_object*) --ignore-fn=_vasprintf --ignore-fn=xpc_bundle_create_from_origin --ignore-fn=_xpc_realpath --ignore-fn=_xpc_realpath_fd --ignore-fn=_xpc_bundle_resolve_executable_variant --ignore-fn=_xpc_bundle_copy_container --alloc-fn=_xpc_alloc --alloc-fn=_malloc_zone_malloc_with_options_np_outlined --ignore-fn=objc::DenseMap<objc_class*, objc::category_list, objc::DenseMapValueInfo<objc::category_list>, objc::DenseMapInfo<objc_class*>, objc::detail::DenseMapPair<objc_class*, objc::category_list> >::init(unsigned int) --ignore-fn=objc::DenseMap<DisguisedPtr<objc_class>, objc::category_list, objc::DenseMapValueInfo<objc::category_list>, objc::DenseMapInfo<DisguisedPtr<objc_class> >, objc::detail::DenseMapPair<DisguisedPtr<objc_class>, objc::category_list> >::init(unsigned int) --ignore-fn=xpc_bundle_create_from_origin_with_string_cache
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

massif/tests/alloc-fns-A.vgtest

@@ -3,5 +3,11 @@ vgopts: --stacks=no --time-unit=B --heap-admin=0 --massif-out-file=massif.out
 vgopts: --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook --ignore-fn=get_or_create_key_element
 # Darwin ignore functions, for macOS 10.13
 vgopts: --alloc-fn=_xpc_malloc --ignore-fn=_xpc_dictionary_insert --ignore-fn=map_images_nolock --ignore-fn="allocBuckets(void*, unsigned int)" --ignore-fn="realizeClass(objc_class*)" --ignore-fn=_NXHashRehashToCapacity --ignore-fn=NXCreateHashTableFromZone --ignore-fn=NXCreateMapTableFromZone --ignore-fn=NXHashInsert --ignore-fn=add_class_to_loadable_list --ignore-fn=class_createInstance --ignore-fn=xpc_string_create --alloc-fn=strdup --alloc-fn=_xpc_calloc --ignore-fn=xpc_array_create
+# Darwin ignore functions, as of macOS 15
+vgopts: --ignore-fn="realizeClassWithoutSwift(objc_class*, objc_class*)" --ignore-fn="allocBuckets(unsigned int)" --alloc-fn=_xpc_alloc_typed --ignore-fn=_xpc_array_create --alloc-fn=_xpc_strdup --ignore-fn=NXCreateMapTable --ignore-fn=NXCreateHashTable --ignore-fn="id2data(objc_object*, SyncKind, usage)" --ignore-fn="class_rw_t::extAlloc(class_ro_t const*, bool)" --ignore-fn="_fetchInitializingClassList(bool)" --ignore-fn="objc::SafeRanges::add(unsigned long, unsigned long)" --ignore-fn="cache_t::insert(objc_selector*, void (*)(), objc_object*)" --ignore-fn=_vasprintf --ignore-fn=xpc_bundle_create_from_origin --ignore-fn=_xpc_realpath --ignore-fn=_xpc_realpath_fd --ignore-fn=_xpc_bundle_resolve_executable_variant --ignore-fn=_xpc_bundle_copy_container --alloc-fn=_xpc_alloc --alloc-fn=_malloc_zone_malloc_with_options_np_outlined
+vgopts: --ignore-fn="objc::DenseMap<objc_class*, objc::category_list, objc::DenseMapValueInfo<objc::category_list>, objc::DenseMapInfo<objc_class*>, objc::detail::DenseMapPair<objc_class*, objc::category_list> >::init(unsigned int)"
+vgopts: --ignore-fn="objc::DenseMap<DisguisedPtr<objc_class>, objc::category_list, objc::DenseMapValueInfo<objc::category_list>, objc::DenseMapInfo<DisguisedPtr<objc_class> >, objc::detail::DenseMapPair<DisguisedPtr<objc_class>, objc::category_list> >::init(unsigned int)"
+ # Darwin ignore functions, as of macOS
+vgopts: --ignore-fn=xpc_bundle_create_from_origin_with_string_cache
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

massif/tests/alloc-fns-B.post.exp

@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./alloc-fns
-Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --alloc-fn=a4 --alloc-fn=b4 --alloc-fn=b3 --alloc-fn=c4 --alloc-fn=c3 --alloc-fn=c2 --alloc-fn=d4 --alloc-fn=d3 --alloc-fn=d2 --alloc-fn=d1 --massif-out-file=massif.out --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook --ignore-fn=get_or_create_key_element --alloc-fn=_xpc_malloc --ignore-fn=_xpc_dictionary_insert --ignore-fn=map_images_nolock --ignore-fn=allocBuckets(void*, unsigned int) --ignore-fn=realizeClass(objc_class*) --ignore-fn=_NXHashRehashToCapacity --ignore-fn=NXCreateHashTableFromZone --ignore-fn=NXCreateMapTableFromZone --ignore-fn=NXHashInsert --ignore-fn=add_class_to_loadable_list --ignore-fn=class_createInstance --ignore-fn=xpc_string_create --alloc-fn=strdup --alloc-fn=_xpc_calloc --ignore-fn=xpc_array_create
+Massif arguments:   --stacks=no --time-unit=B --heap-admin=0 --alloc-fn=a4 --alloc-fn=b4 --alloc-fn=b3 --alloc-fn=c4 --alloc-fn=c3 --alloc-fn=c2 --alloc-fn=d4 --alloc-fn=d3 --alloc-fn=d2 --alloc-fn=d1 --massif-out-file=massif.out --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook --ignore-fn=get_or_create_key_element --alloc-fn=_xpc_malloc --ignore-fn=_xpc_dictionary_insert --ignore-fn=map_images_nolock --ignore-fn=allocBuckets(void*, unsigned int) --ignore-fn=realizeClass(objc_class*) --ignore-fn=_NXHashRehashToCapacity --ignore-fn=NXCreateHashTableFromZone --ignore-fn=NXCreateMapTableFromZone --ignore-fn=NXHashInsert --ignore-fn=add_class_to_loadable_list --ignore-fn=class_createInstance --ignore-fn=xpc_string_create --alloc-fn=strdup --alloc-fn=_xpc_calloc --ignore-fn=xpc_array_create --ignore-fn=realizeClassWithoutSwift(objc_class*, objc_class*) --ignore-fn=allocBuckets(unsigned int) --alloc-fn=_xpc_alloc_typed --ignore-fn=_xpc_array_create --alloc-fn=_xpc_strdup --ignore-fn=NXCreateMapTable --ignore-fn=NXCreateHashTable --ignore-fn=id2data(objc_object*, SyncKind, usage) --ignore-fn=class_rw_t::extAlloc(class_ro_t const*, bool) --ignore-fn=_fetchInitializingClassList(bool) --ignore-fn=objc::SafeRanges::add(unsigned long, unsigned long) --ignore-fn=cache_t::insert(objc_selector*, void (*)(), objc_object*) --ignore-fn=_vasprintf --ignore-fn=xpc_bundle_create_from_origin --ignore-fn=_xpc_realpath --ignore-fn=_xpc_realpath_fd --ignore-fn=_xpc_bundle_resolve_executable_variant --ignore-fn=_xpc_bundle_copy_container --alloc-fn=_xpc_alloc --alloc-fn=_malloc_zone_malloc_with_options_np_outlined --ignore-fn=objc::DenseMap<objc_class*, objc::category_list, objc::DenseMapValueInfo<objc::category_list>, objc::DenseMapInfo<objc_class*>, objc::detail::DenseMapPair<objc_class*, objc::category_list> >::init(unsigned int) --ignore-fn=objc::DenseMap<DisguisedPtr<objc_class>, objc::category_list, objc::DenseMapValueInfo<objc::category_list>, objc::DenseMapInfo<DisguisedPtr<objc_class> >, objc::detail::DenseMapPair<DisguisedPtr<objc_class>, objc::category_list> >::init(unsigned int) --ignore-fn=xpc_bundle_create_from_origin_with_string_cache
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 

massif/tests/alloc-fns-B.vgtest

@@ -3,5 +3,11 @@ vgopts: --stacks=no --time-unit=B --heap-admin=0 --alloc-fn=a4 --alloc-fn=b4 --a
 vgopts: --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook --ignore-fn=get_or_create_key_element
 # Darwin ignore functions, for macOS 10.13
 vgopts: --alloc-fn=_xpc_malloc --ignore-fn=_xpc_dictionary_insert --ignore-fn=map_images_nolock --ignore-fn="allocBuckets(void*, unsigned int)" --ignore-fn="realizeClass(objc_class*)" --ignore-fn=_NXHashRehashToCapacity --ignore-fn=NXCreateHashTableFromZone --ignore-fn=NXCreateMapTableFromZone --ignore-fn=NXHashInsert --ignore-fn=add_class_to_loadable_list --ignore-fn=class_createInstance --ignore-fn=xpc_string_create --alloc-fn=strdup --alloc-fn=_xpc_calloc --ignore-fn=xpc_array_create
+# Darwin ignore functions, as of macOS 15
+vgopts: --ignore-fn="realizeClassWithoutSwift(objc_class*, objc_class*)" --ignore-fn="allocBuckets(unsigned int)" --alloc-fn=_xpc_alloc_typed --ignore-fn=_xpc_array_create --alloc-fn=_xpc_strdup --ignore-fn=NXCreateMapTable --ignore-fn=NXCreateHashTable --ignore-fn="id2data(objc_object*, SyncKind, usage)" --ignore-fn="class_rw_t::extAlloc(class_ro_t const*, bool)" --ignore-fn="_fetchInitializingClassList(bool)" --ignore-fn="objc::SafeRanges::add(unsigned long, unsigned long)" --ignore-fn="cache_t::insert(objc_selector*, void (*)(), objc_object*)" --ignore-fn=_vasprintf --ignore-fn=xpc_bundle_create_from_origin --ignore-fn=_xpc_realpath --ignore-fn=_xpc_realpath_fd --ignore-fn=_xpc_bundle_resolve_executable_variant --ignore-fn=_xpc_bundle_copy_container --alloc-fn=_xpc_alloc --alloc-fn=_malloc_zone_malloc_with_options_np_outlined
+vgopts: --ignore-fn="objc::DenseMap<objc_class*, objc::category_list, objc::DenseMapValueInfo<objc::category_list>, objc::DenseMapInfo<objc_class*>, objc::detail::DenseMapPair<objc_class*, objc::category_list> >::init(unsigned int)"
+vgopts: --ignore-fn="objc::DenseMap<DisguisedPtr<objc_class>, objc::category_list, objc::DenseMapValueInfo<objc::category_list>, objc::DenseMapInfo<DisguisedPtr<objc_class> >, objc::detail::DenseMapPair<DisguisedPtr<objc_class>, objc::category_list> >::init(unsigned int)"
+# Darwin ignore functions, as of macOS
+vgopts: --ignore-fn=xpc_bundle_create_from_origin_with_string_cache
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out

massif/tests/basic.post.exp

@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./basic
-Massif arguments:   --stacks=no --time-unit=B --massif-out-file=massif.out --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook --ignore-fn=get_or_create_key_element --alloc-fn=_xpc_malloc --ignore-fn=_xpc_dictionary_insert --ignore-fn=map_images_nolock --ignore-fn=allocBuckets(void*, unsigned int) --ignore-fn=realizeClass(objc_class*) --ignore-fn=_NXHashRehashToCapacity --ignore-fn=NXCreateHashTableFromZone --ignore-fn=NXCreateMapTableFromZone --ignore-fn=NXHashInsert --ignore-fn=add_class_to_loadable_list --ignore-fn=class_createInstance --ignore-fn=xpc_string_create --alloc-fn=strdup --alloc-fn=_xpc_calloc --ignore-fn=xpc_array_create
+Massif arguments:   --stacks=no --time-unit=B --massif-out-file=massif.out --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook --ignore-fn=get_or_create_key_element --alloc-fn=_xpc_malloc --ignore-fn=_xpc_dictionary_insert --ignore-fn=map_images_nolock --ignore-fn=allocBuckets(void*, unsigned int) --ignore-fn=realizeClass(objc_class*) --ignore-fn=_NXHashRehashToCapacity --ignore-fn=NXCreateHashTableFromZone --ignore-fn=NXCreateMapTableFromZone --ignore-fn=NXHashInsert --ignore-fn=add_class_to_loadable_list --ignore-fn=class_createInstance --ignore-fn=xpc_string_create --alloc-fn=strdup --alloc-fn=_xpc_calloc --ignore-fn=xpc_array_create --ignore-fn=realizeClassWithoutSwift(objc_class*, objc_class*) --ignore-fn=allocBuckets(unsigned int) --alloc-fn=_xpc_alloc_typed --ignore-fn=_xpc_array_create --alloc-fn=_xpc_strdup --ignore-fn=NXCreateMapTable --ignore-fn=NXCreateHashTable --ignore-fn=id2data(objc_object*, SyncKind, usage) --ignore-fn=class_rw_t::extAlloc(class_ro_t const*, bool) --ignore-fn=_fetchInitializingClassList(bool) --ignore-fn=objc::SafeRanges::add(unsigned long, unsigned long) --ignore-fn=cache_t::insert(objc_selector*, void (*)(), objc_object*) --ignore-fn=_vasprintf --ignore-fn=xpc_bundle_create_from_origin --ignore-fn=_xpc_realpath --ignore-fn=_xpc_realpath_fd --ignore-fn=_xpc_bundle_resolve_executable_variant --ignore-fn=_xpc_bundle_copy_container --alloc-fn=_xpc_alloc --alloc-fn=_malloc_zone_malloc_with_options_np_outlined --ignore-fn=objc::DenseMap<objc_class*, objc::category_list, objc::DenseMapValueInfo<objc::category_list>, objc::DenseMapInfo<objc_class*>, objc::detail::DenseMapPair<objc_class*, objc::category_list> >::init(unsigned int) --ignore-fn=objc::DenseMap<DisguisedPtr<objc_class>, objc::category_list, objc::DenseMapValueInfo<objc::category_list>, objc::DenseMapInfo<DisguisedPtr<objc_class> >, objc::detail::DenseMapPair<DisguisedPtr<objc_class>, objc::category_list> >::init(unsigned int) --ignore-fn=xpc_bundle_create_from_origin_with_string_cache
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------