Makefile diff - tests/Makefile - Libmalloc source code libmalloc-657.60.21

tests/Makefile libmalloc-657.60.21 ⇄ libmalloc-792.80.2
--- libmalloc/libmalloc-657.60.21/tests/Makefile
+++ libmalloc/libmalloc-792.80.2/tests/Makefile
@@ -4,28 +4,14 @@
 DEVELOPER_DIR ?= $(shell xcode-select -p)
 
 include $(DEVELOPER_DIR)/AppleInternal/Makefiles/darwintest/Makefile.common
-
-TRACE_FILES := \
-	$(notdir $(wildcard $(SRCROOT)/../traces/*.mtrace))
-
-# add trace files without the traces/ prefix, fex:
-#   exclude_this_file.mtrace
-EXCLUDED_TRACE_FILES :=
 
 MALLOC_EXCLAVES := $(if $(findstring Exclave,$(PLATFORM)),YES,NO)
 MALLOC_EXCLAVECORE := $(if $(findstring ExclaveCore,$(PLATFORM)),YES,NO)
 MALLOC_EXCLAVEKIT := $(if $(findstring ExclaveKit,$(PLATFORM)),YES,NO)
 
-ifeq ($(MALLOC_EXCLAVES),NO)
-OTHER_TEST_TARGETS = \
-	$(addprefix nano-trace-replay_, $(basename $(filter-out $(EXCLUDED_TRACE_FILES), $(TRACE_FILES))))
-endif
-
 BATS_PLISTS_EXTRACT = \
 	$(patsubst %,$(SYMROOT)/%.plist,$(OTHER_TEST_TARGETS))
 
-EXCLUDED_SOURCES := \
-	nano_trace_replay.c
 CXX := $(shell $(XCRUN) -sdk "$(TARGETSDK)" -find clang++)
 
 WARNING_CFLAGS := -Wno-format-invalid-specifier -Wno-format-extra-args
@@ -33,9 +19,11 @@
 	-DDARWINTEST \
 	-DOS_ATOMIC_CONFIG_MEMORY_ORDER_DEPENDENCY=1 \
 	-DT_META_TAG_XZONE_AND_PGM=T_META_TAG\(\"xzone_and_pgm\"\) \
-	-DT_META_TAG_XZONE=T_META_TAG\(\"xzone\"\) \
+	-DT_META_TAG_NO_ALLOCATOR_OVERRIDE=T_META_TAG\(\"no_allocator_override\"\) \
+	-DT_META_TAG_ALL_ALLOCATORS=T_META_TAG\(\"all_allocators\"\) \
 	-DT_META_TAG_XZONE_ONLY=T_META_TAG\(\"xzone_only\"\) \
-	-DT_META_TAG_NANO_ON_XZONE=T_META_TAG\(\"nano_on_xzone\"\) \
+	-DT_META_TAG_MAGAZINE_ONLY=T_META_TAG\(\"magazine_only\"\) \
+	-DT_META_TAG_DISABLE_SANITIZERS_TRACES=T_META_TAG\(\"disable_sanitizers_traces\"\) \
 	-I$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders \
 	-I$(SRCROOT)/../private \
 	-I$(SRCROOT)/../include \
@@ -50,7 +38,7 @@
 OTHER_CFLAGS += -DL4_CONFIG_PLAT_EVP
 OTHER_CFLAGS += -isystem $(SDKROOT)/System/ExclaveKit/usr/local/standalone/cL4-future/include
 OTHER_LDFLAGS += -L $(SDKROOT)/System/ExclaveKit/usr/local/lib
-OTHER_LDFLAGS += -lc++
+OTHER_LDFLAGS += -lc++ -lobjc
 
 # FIXME: This should be inherited from SDKSettings.json, but Xcode doesn't
 # invoke the darwintests target once for each variant in BUILD_VARIANTS
@@ -81,11 +69,7 @@
 	-llibc \
 	-llibc_plat_cl4_standalone_malloc \
 	-lm \
-	-lmalloc \
-	-lpmm \
-	-lvas \
-	-lvas-core \
-	-lxrt
+	-lmalloc
 
 # FIXME: This should be inherited from SDKSettings.json, but Xcode doesn't
 # invoke the darwintests target once for each variant in BUILD_VARIANTS
@@ -155,17 +139,27 @@
 	tsan.c \
 	memory_pressure.c \
 	malloc_msl.c \
-	madvise.c
+	madvise.c \
+	security_policy.c
 
 # Exclaves don't support dispatch_apply, which this perf test relies on
 EXCLUDED_SOURCES += basic_malloc_free_perf.c
 
-# These two tests both include C files to test submodules, which causes symbol
+# Guarded range is not implemented for Exclaves
+EXCLUDED_SOURCES += guarded_range_tests.c
+
+# Backdeployment is not supported
+EXCLUDED_SOURCES += malloc_type_backdeploy.c
+
+# These tests both include C files to test submodules, which causes symbol
 # conflicts in the statically linked exclavecore tests
 ifeq ($(MALLOC_EXCLAVECORE),YES)
 EXCLUDED_SOURCES += \
 	mfm_test.c \
+	xzone_segment_tests.c \
 	xzone_metapool_tests.c
+# This also includes the C file to implement the unit tests.
+EXCLUDED_SOURCES += mte_instrumentation_tests.c
 endif # MALLOC_EXCLAVECORE
 else
 OTHER_CFLAGS += \
@@ -176,15 +170,6 @@
 PRIVATE_FRAMEWORKS = $(SDKROOT)/System/Library/PrivateFrameworks
 PERFDATA_FRAMEWORK = perfdata
 
-nano-trace-replay_%: $(SRCROOT)/nano_trace_replay.c
-	$(CC) \
-		$(CFLAGS) $(DT_CFLAGS) $(OTHER_CFLAGS) \
-		$(LDFLAGS) $(DT_LDFLAGS) $(OTHER_LDFLAGS) \
-		-DTRACE_NAME="$(patsubst nano-trace-replay_%,%,$(notdir $@))" \
-		$(patsubst _Photos_puja,-DTEST_TIMEOUT=3000,$(findstring _Photos_puja,$(notdir $@))) \
-		-o $@ \
-		$(SRCROOT)/nano_trace_replay.c
-
 BATS_PLISTS = $(BATS_PLISTS_EXTRACT)
 BATS_PLISTS += $(PROJECT_DIR)/tests/xctests/BATS.plist
 
@@ -196,7 +181,7 @@
 asan: OTHER_CFLAGS += -fsanitize=address
 asan: OTHER_LDFLAGS += -Wl,-rpath -Wl,$(SANITIZER_DYLIB_PATH)
 
-ifeq ($(Embedded),NO)
+ifeq ($(PLATFORM),MacOSX)
 tsan: CFLAGS := $(filter-out $(ARCH_FLAGS),$(CFLAGS)) -arch x86_64 -fsanitize=thread
 tsan: OTHER_LDFLAGS += -Wl,-rpath -Wl,$(SANITIZER_DYLIB_PATH)
 else
@@ -216,6 +201,23 @@
 pgm_integration: OTHER_LDFLAGS += -framework MallocStackLogging
 
 ifeq ($(MALLOC_EXCLAVES),NO)
+malloc_type_backdeploy: OTHER_CFLAGS := $(filter-out -fno-builtin -fno-typed-memory-operations,$(OTHER_CFLAGS)) -ftyped-memory-operations
+ifeq ($(PLATFORM),MacOSX)
+malloc_type_backdeploy: DEPLOYMENT_TARGET_FLAGS := -target unknown-apple-macosx13.0
+else ifeq ($(PLATFORM),iPhoneOS)
+malloc_type_backdeploy: DEPLOYMENT_TARGET_FLAGS := -target unknown-apple-ios16.0
+else ifeq ($(PLATFORM),WatchOS)
+malloc_type_backdeploy: DEPLOYMENT_TARGET_FLAGS := -target unknown-apple-watchos9.0
+else ifeq ($(PLATFORM),AppleTVOS)
+malloc_type_backdeploy: DEPLOYMENT_TARGET_FLAGS := -target unknown-apple-tvos16.0
+else ifeq ($(PLATFORM),BridgeOS)
+malloc_type_backdeploy: DEPLOYMENT_TARGET_FLAGS := -target unknown-apple-bridgeos8.0
+else ifeq ($(PLATFORM),XROS)
+malloc_type_backdeploy: DEPLOYMENT_TARGET_FLAGS := -target unknown-apple-xros1.0
+else
+$(error Unknown platform $(PLATFORM)!)
+endif
+
 malloc_with_options_test: OTHER_LDFLAGS += -F $(PRIVATE_FRAMEWORKS)
 malloc_with_options_test: OTHER_LDFLAGS += -framework ktrace
 endif
@@ -225,19 +227,52 @@
 malloc_claimed_address_tests: OTHER_CFLAGS += -I../src
 scribble_tests: OTHER_CFLAGS += -I../src
 malloc_size_test: OTHER_CFLAGS += -I../src
-
 xzone: OTHER_LDFLAGS += -ldarwintest_utils
+
+enablement_tests: OTHER_LDFLAGS += -lobjc -fobjc-arc -ldarwintest_utils
+
+EXCLUDED_SOURCES += entitlement_test_tool.c guarded_range_test_tool.c
+
+ifeq ($(MALLOC_EXCLAVES),NO)
+hardened_heap_test_tool: entitlement_test_tool.c
+	mkdir -p $(SYMROOT)/assets/
+	$(CC) -o $(SYMROOT)/assets/$@ $(CFLAGS) $(OTHER_CFLAGS) $(LDFLAGS) $(OTHER_LDFLAGS) $<
+	env CODESIGN_ALLOCATE=$(CODESIGN_ALLOCATE) $(CODESIGN) --force --sign - --timestamp=none --entitlements hardened_heap_test_tool-entitlements.plist $(SYMROOT)/assets/hardened_heap_test_tool
+
+install-hardened_heap_test_tool: hardened_heap_test_tool
+	mkdir -p $(INSTALLDIR)/assets
+	@cp $(SYMROOT)/assets/hardened_heap_test_tool $(INSTALLDIR)/assets
+
+hardened_browser_test_tool: entitlement_test_tool.c
+	mkdir -p $(SYMROOT)/assets/
+	$(CC) -o $(SYMROOT)/assets/$@ $(CFLAGS) $(OTHER_CFLAGS) $(LDFLAGS) $(OTHER_LDFLAGS) $<
+	env CODESIGN_ALLOCATE=$(CODESIGN_ALLOCATE) $(CODESIGN) --force --sign - --timestamp=none --entitlements hardened_browser_test_tool-entitlements.plist $(SYMROOT)/assets/hardened_browser_test_tool
+
+install-hardened_browser_test_tool: hardened_browser_test_tool
+	mkdir -p $(INSTALLDIR)/assets
+	@cp $(SYMROOT)/assets/hardened_browser_test_tool $(INSTALLDIR)/assets
+
+guarded_range_test_tool: guarded_range_test_tool.c
+	mkdir -p $(SYMROOT)/assets/
+	$(CC) -o $(SYMROOT)/assets/$@ $(CFLAGS) $(OTHER_CFLAGS) $(LDFLAGS) $(OTHER_LDFLAGS) $<
+	env CODESIGN_ALLOCATE=$(CODESIGN_ALLOCATE) $(CODESIGN) --force --sign - --timestamp=none $(SYMROOT)/assets/guarded_range_test_tool
+
+install-guarded_range_test_tool: guarded_range_test_tool
+	mkdir -p $(INSTALLDIR)/assets
+	@cp $(SYMROOT)/assets/guarded_range_test_tool $(INSTALLDIR)/assets
+
+CUSTOM_TARGETS += hardened_heap_test_tool hardened_browser_test_tool guarded_range_test_tool
+endif
+
+MALLOC_TYPE_SWIFT_OBJS := $(addsuffix .o,$(addprefix malloc_type_swift_,$(ARCH_CONFIGS)))
+MALLOC_TYPE_SYM_SWIFT_OBJS := $(addprefix $(SYMROOT)/,$(MALLOC_TYPE_SWIFT_OBJS))
+
+memory_pressure: OTHER_CFLAGS := $(filter-out -fno-builtin -fno-typed-memory-operations,$(OTHER_CFLAGS))
 
 # -fno-builtin also disables TMO
 #
 # Build this test with no explicit TMO options to validate that it gets TMO
 # automatically on platforms where that's expected
-
-printer_tests: OTHER_LDFLAGS += -lobjc -fobjc-arc -ldarwintest_utils
-
-MALLOC_TYPE_SWIFT_OBJS := $(addsuffix .o,$(addprefix malloc_type_swift_,$(ARCH_CONFIGS)))
-MALLOC_TYPE_SYM_SWIFT_OBJS := $(addprefix $(SYMROOT)/,$(MALLOC_TYPE_SWIFT_OBJS))
-
 malloc_type: OTHER_CFLAGS := $(filter-out -fno-builtin -fno-typed-memory-operations,$(OTHER_CFLAGS))
 malloc_type: OTHER_CFLAGS += $(SYMROOT)/malloc_type_cpp.o $(MALLOC_TYPE_SYM_SWIFT_OBJS) $(SYMROOT)/malloc_type_objc.o
 malloc_type: $(SYMROOT)/malloc_type_cpp.o $(MALLOC_TYPE_SYM_SWIFT_OBJS) $(SYMROOT)/malloc_type_objc.o
@@ -267,15 +302,20 @@
 malloc_type_callsite: OTHER_CFLAGS += $(SYMROOT)/malloc_type_callsite_cpp.o
 malloc_type_callsite: OTHER_LDFLAGS += -lc++
 
+mte_tests: OTHER_CFLAGS := $(filter-out -fno-builtin -fno-typed-memory-operations,$(OTHER_CFLAGS)) -Xclang -target-feature -Xclang +mte
+mte_tests: CODE_SIGN_ENTITLEMENTS = mte_tests.entitlements
+mte_instrumentation_tests: OTHER_CFLAGS := $(OTHER_CFLAGS) -I../src -Xclang -target-feature -Xclang +mte -DCONFIG_MTE=1
+mte_instrumentation_tests: CODE_SIGN_ENTITLEMENTS = mte_instrumentation_tests.entitlements
+
+guarded_range_tests: OTHER_LDFLAGS := -ldarwintest_utils
+
 ifeq ($(MALLOC_EXCLAVES),NO)
 # BATS test plist handling
+#  - Modify plist (add tests) to run general tests again with xzone malloc enabled
 #  - Create separate plist to re-run test suite with PGM
-#  - Modify plist (add tests) to run general tests again with xzone malloc enabled
 project_test_configs: bats.plist
 	mkdir -p $(DSTROOT)/AppleInternal/CoreOS/BATS/unit_tests/
-	xcrun -sdk $(SDKROOT) python3 ./create_pgm_plist.py $(SYMROOT)/bats.plist $(SYMROOT)/libmalloc_pgm.plist
-	cp $(SYMROOT)/libmalloc_pgm.plist $(DSTROOT)/AppleInternal/CoreOS/BATS/unit_tests/
-	xcrun -sdk $(SDKROOT) python3 ./add_xzone_tests.py $(SYMROOT)/bats.plist --platform $(PLATFORM)
+	xcrun -sdk $(SDKROOT) python3 ./process_bats_plist.py $(SYMROOT)/bats.plist $(DSTROOT)/AppleInternal/CoreOS/BATS/unit_tests/ --platform $(PLATFORM)
 
 .PHONY: project_test_configs