Loading...
src/dyldAPIsInLibSystem.cpp dyld-551.3 dyld-733.6
--- dyld/dyld-551.3/src/dyldAPIsInLibSystem.cpp
+++ dyld/dyld-733.6/src/dyldAPIsInLibSystem.cpp
@@ -26,25 +26,34 @@
 #include <string.h>
 #include <malloc/malloc.h>
 #include <sys/mman.h>
-
+#include <execinfo.h>
+
+#include <System/sys/csr.h>
 #include <crt_externs.h>
 #include <Availability.h>
+#if !TARGET_OS_DRIVERKIT
 #include <vproc_priv.h>
-
+#endif
 #include <dirent.h>
+#include <sys/types.h>
 #include <sys/stat.h>
-
-#include "mach-o/dyld_images.h"
-#include "mach-o/dyld.h"
-#include "mach-o/dyld_priv.h"
+#include <fcntl.h>
+#include <System/sys/codesign.h>
+
+#include <mach-o/dyld_images.h>
+#include <mach-o/dyld.h>
+#include <mach-o/dyld_priv.h>
+
 #include "dyld_cache_format.h"
+#include "objc-shared-cache.h"
 
 #include "ImageLoader.h"
 #include "dyldLock.h"
-#include "start_glue.h"
-
-#include "../dyld3/APIs.h"
-#include "../dyld3/AllImages.h"
+
+#include "APIs.h"
+#include "AllImages.h"
+#include "StartGlue.h"
+#include "Tracing.h"
 
 
 // this was in dyld_priv.h but it is no longer exported
@@ -62,76 +71,18 @@
 //
 extern "C" int _dyld_func_lookup(const char* dyld_func_name, void **address);
 
+#if TARGET_OS_IOS && !TARGET_OS_SIMULATOR
+namespace dyld3 {
+    extern int compatFuncLookup(const char* name, void** address) __API_AVAILABLE(ios(13.0));
+}
+extern "C" void setLookupFunc(void*);
+#endif
+
 
 extern bool gUseDyld3;
 
-#ifndef LC_VERSION_MIN_MACOSX
-	#define LC_VERSION_MIN_MACOSX 0x24
-	struct version_min_command {
-		uint32_t	cmd;		/* LC_VERSION_MIN_MACOSX or
-					   LC_VERSION_MIN_IPHONEOS  */
-		uint32_t	cmdsize;	/* sizeof(struct min_version_command) */
-		uint32_t	version;	/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
-		uint32_t	sdk;		/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
-	};
-#endif
-
-#ifndef LC_VERSION_MIN_IPHONEOS
-	#define LC_VERSION_MIN_IPHONEOS 0x25
-#endif
-
-#ifndef LC_VERSION_MIN_TVOS
-	#define LC_VERSION_MIN_TVOS 0x2F
-#endif
-
-#ifndef LC_VERSION_MIN_WATCHOS
-	#define LC_VERSION_MIN_WATCHOS 0x30
-#endif
-
-
-#ifndef LC_LOAD_UPWARD_DYLIB
-	#define	LC_LOAD_UPWARD_DYLIB (0x23|LC_REQ_DYLD)	/* load of dylib whose initializers run later */
-#endif
-
-#ifndef LC_BUILD_VERSION
-	#define LC_BUILD_VERSION 0x32 /* build for platform min OS version */
-
-	/*
-	 * The build_version_command contains the min OS version on which this 
-	 * binary was built to run for its platform.  The list of known platforms and
-	 * tool values following it.
-	 */
-	struct build_version_command {
-		uint32_t	cmd;		/* LC_BUILD_VERSION */
-		uint32_t	cmdsize;	/* sizeof(struct build_version_command) plus */
-								/* ntools * sizeof(struct build_tool_version) */
-		uint32_t	platform;	/* platform */
-		uint32_t	minos;		/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
-		uint32_t	sdk;		/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
-		uint32_t	ntools;		/* number of tool entries following this */
-	};
-
-	struct build_tool_version {
-		uint32_t	tool;		/* enum for the tool */
-		uint32_t	version;	/* version number of the tool */
-	};
-
-	/* Known values for the platform field above. */
-	#define PLATFORM_MACOS		1
-	#define PLATFORM_IOS		2
-	#define PLATFORM_TVOS		3
-	#define PLATFORM_WATCHOS	4
-	#define PLATFORM_BRIDGEOS	5
-
-	/* Known values for the tool field above. */
-	#define TOOL_CLANG	1
-	#define TOOL_SWIFT	2
-	#define TOOL_LD		3
-#endif
-
-
 // deprecated APIs are still availble on Mac OS X, but not on iPhone OS
-#if __IPHONE_OS_VERSION_MIN_REQUIRED	
+#if __IPHONE_OS_VERSION_MIN_REQUIRED || TARGET_OS_DRIVERKIT
 	#define DEPRECATED_APIS_SUPPORTED 0
 #else
 	#define DEPRECATED_APIS_SUPPORTED 1
@@ -532,262 +483,84 @@
 	return (-1);
 }
 
-
-#define PACKED_VERSION(major, minor, tiny) ((((major) & 0xffff) << 16) | (((minor) & 0xff) << 8) | ((tiny) & 0xff))
-
-
-static bool getVersionLoadCommandInfo(const mach_header* mh, uint32_t* platform, uint32_t* minOS, uint32_t* sdk)
-{
-	const load_command* startCmds = NULL;
-	if ( mh->magic == MH_MAGIC_64 )
-		startCmds = (load_command*)((char *)mh + sizeof(mach_header_64));
-	else if ( mh->magic == MH_MAGIC )
-		startCmds = (load_command*)((char *)mh + sizeof(mach_header));
-	else
-		return false;  // not a mach-o file, or wrong endianness
-		
-	const load_command* const cmdsEnd = (load_command*)((char*)startCmds + mh->sizeofcmds);
-	const load_command* cmd = startCmds;
-	for(uint32_t i = 0; i < mh->ncmds; ++i) {
-	    const load_command* nextCmd = (load_command*)((char *)cmd + cmd->cmdsize);
-		if ( (cmd->cmdsize < 8) || (nextCmd > cmdsEnd) || (nextCmd < startCmds)) {
-			return 0;
-		}
-		const version_min_command* versCmd;
-		const build_version_command* buildVersCmd;
-		switch ( cmd->cmd ) {
-			case LC_VERSION_MIN_IPHONEOS:
-				versCmd = (version_min_command*)cmd;
-				*platform	= PLATFORM_IOS;
-				*minOS		= versCmd->version;
-				*sdk		= versCmd->sdk;
-				return true;
-			case LC_VERSION_MIN_MACOSX:
-				versCmd = (version_min_command*)cmd;
-				*platform	= PLATFORM_MACOS;
-				*minOS		= versCmd->version;
-				*sdk		= versCmd->sdk;
-				return true;
-			case LC_VERSION_MIN_TVOS:
-				versCmd = (version_min_command*)cmd;
-				*platform	= PLATFORM_TVOS;
-				*minOS		= versCmd->version;
-				*sdk		= versCmd->sdk;
-				return true;
-			case LC_VERSION_MIN_WATCHOS:
-				versCmd = (version_min_command*)cmd;
-				*platform	= PLATFORM_WATCHOS;
-				*minOS		= versCmd->version;
-				*sdk		= versCmd->sdk;
-				return true;
-			case LC_BUILD_VERSION:
-				buildVersCmd = (build_version_command*)cmd;
-				*platform	 = buildVersCmd->platform;
-				*minOS		 = buildVersCmd->minos;
-				*sdk		 = buildVersCmd->sdk;
-				return true;
-		}
-		cmd = nextCmd;
-	}
-	return false;
-}
-
-#if !__WATCH_OS_VERSION_MIN_REQUIRED && !__TV_OS_VERSION_MIN_REQUIRED
-static uint32_t deriveSDKVersFromDylibs(const mach_header* mh)
-{
-	const load_command* startCmds = NULL;
-	if ( mh->magic == MH_MAGIC_64 )
-		startCmds = (load_command*)((char *)mh + sizeof(mach_header_64));
-	else if ( mh->magic == MH_MAGIC )
-		startCmds = (load_command*)((char *)mh + sizeof(mach_header));
-	else
-		return 0;  // not a mach-o file, or wrong endianness
-		
-	const load_command* const cmdsEnd = (load_command*)((char*)startCmds + mh->sizeofcmds);
-	const dylib_command* dylibCmd;
-	const load_command* cmd = startCmds;
-	const char* dylibName;
-  #if __IPHONE_OS_VERSION_MIN_REQUIRED
-	uint32_t foundationVers = 0;
-  #else
-	uint32_t libSystemVers = 0;
-  #endif
-	for(uint32_t i = 0; i < mh->ncmds; ++i) {
-	    const load_command* nextCmd = (load_command*)((char *)cmd + cmd->cmdsize);
-		// <rdar://problem/14381579&16050962> sanity check size of command
-		if ( (cmd->cmdsize < 8) || (nextCmd > cmdsEnd) || (nextCmd < startCmds)) {
-			return 0;
-		}
-		switch ( cmd->cmd ) {
-			case LC_LOAD_DYLIB:
-			case LC_LOAD_WEAK_DYLIB:
-			case LC_LOAD_UPWARD_DYLIB:
-				dylibCmd = (dylib_command*)cmd;
-				// sanity check dylib command layout
-				if ( dylibCmd->dylib.name.offset > cmd->cmdsize )
-					return 0;
-				dylibName = (char*)dylibCmd + dylibCmd->dylib.name.offset;
-  #if __IPHONE_OS_VERSION_MIN_REQUIRED
-				if ( strcmp(dylibName, "/System/Library/Frameworks/Foundation.framework/Foundation") == 0 )
-					foundationVers = dylibCmd->dylib.current_version;
-  #else
-				if ( strcmp(dylibName, "/usr/lib/libSystem.B.dylib") == 0 )
-					libSystemVers = dylibCmd->dylib.current_version;
-  #endif
-				break;
-		}
-		cmd = nextCmd;
-	}
-
-	struct DylibToOSMapping {
-		uint32_t dylibVersion;
-		uint32_t osVersion;
-	};
-	
-  #if __IPHONE_OS_VERSION_MIN_REQUIRED
-	static const DylibToOSMapping foundationMapping[] = {
-		{ PACKED_VERSION(678,24,0), 0x00020000 },
-		{ PACKED_VERSION(678,26,0), 0x00020100 },
-		{ PACKED_VERSION(678,29,0), 0x00020200 },
-		{ PACKED_VERSION(678,47,0), 0x00030000 },
-		{ PACKED_VERSION(678,51,0), 0x00030100 },
-		{ PACKED_VERSION(678,60,0), 0x00030200 },
-		{ PACKED_VERSION(751,32,0), 0x00040000 },
-		{ PACKED_VERSION(751,37,0), 0x00040100 },
-		{ PACKED_VERSION(751,49,0), 0x00040200 },
-		{ PACKED_VERSION(751,58,0), 0x00040300 },
-		{ PACKED_VERSION(881,0,0),  0x00050000 },
-		{ PACKED_VERSION(890,1,0),  0x00050100 },
-		{ PACKED_VERSION(992,0,0),  0x00060000 },
-		{ PACKED_VERSION(993,0,0),  0x00060100 },
-		{ PACKED_VERSION(1038,14,0),0x00070000 },
-		{ PACKED_VERSION(0,0,0),    0x00070000 }
-		// We don't need to expand this table because all recent
-		// binaries have LC_VERSION_MIN_ load command.
-	};
-
-	if ( foundationVers != 0 ) {
-		uint32_t lastOsVersion = 0;
-		for (const DylibToOSMapping* p=foundationMapping; ; ++p) {
-			if ( p->dylibVersion == 0 )
-				return p->osVersion;
-			if ( foundationVers < p->dylibVersion )
-				return lastOsVersion;
-			lastOsVersion = p->osVersion;
-		}
-	}
-
-  #else
-	// Note: versions are for the GM release.  The last entry should
-	// always be zero.  At the start of the next major version,
-	// a new last entry needs to be added and the previous zero
-	// updated to the GM dylib version.
-	static const DylibToOSMapping libSystemMapping[] = {
-		{ PACKED_VERSION(88,1,3),   0x000A0400 },
-		{ PACKED_VERSION(111,0,0),  0x000A0500 },
-		{ PACKED_VERSION(123,0,0),  0x000A0600 },
-		{ PACKED_VERSION(159,0,0),  0x000A0700 },
-		{ PACKED_VERSION(169,3,0),  0x000A0800 },
-		{ PACKED_VERSION(1197,0,0), 0x000A0900 },
-		{ PACKED_VERSION(0,0,0),    0x000A0900 }
-		// We don't need to expand this table because all recent
-		// binaries have LC_VERSION_MIN_ load command.
-	};
-
-	if ( libSystemVers != 0 ) {
-		uint32_t lastOsVersion = 0;
-		for (const DylibToOSMapping* p=libSystemMapping; ; ++p) {
-			if ( p->dylibVersion == 0 )
-				return p->osVersion;
-			if ( libSystemVers < p->dylibVersion )
-				return lastOsVersion;
-			lastOsVersion = p->osVersion;
-		}
-	}
-  #endif
-  return 0;
+#if TARGET_OS_WATCH
+uint32_t dyld_get_program_sdk_watch_os_version()
+{
+    if (gUseDyld3)
+        return dyld3::dyld_get_program_sdk_watch_os_version();
+
+    __block uint32_t retval = 0;
+    __block bool versionFound = false;
+    dyld3::dyld_get_image_versions((mach_header*)_NSGetMachExecuteHeader(), ^(dyld_platform_t platform, uint32_t sdk_version, uint32_t min_version) {
+        if (versionFound) return;
+
+        if (dyld_get_base_platform(platform) == PLATFORM_WATCHOS) {
+            versionFound = true;
+            retval = sdk_version;
+        }
+    });
+
+    return retval;
+}
+
+uint32_t dyld_get_program_min_watch_os_version()
+{
+    if (gUseDyld3)
+        return dyld3::dyld_get_program_min_watch_os_version();
+
+    __block uint32_t retval = 0;
+    __block bool versionFound = false;
+    dyld3::dyld_get_image_versions((mach_header*)_NSGetMachExecuteHeader(), ^(dyld_platform_t platform, uint32_t sdk_version, uint32_t min_version) {
+        if (versionFound) return;
+
+        if (dyld_get_base_platform(platform) == PLATFORM_WATCHOS) {
+            versionFound = true;
+            retval = min_version;
+        }
+    });
+
+    return retval;
 }
 #endif
 
-
-#if __WATCH_OS_VERSION_MIN_REQUIRED
-static uint32_t watchVersToIOSVers(uint32_t vers)
-{
-	return vers + 0x00070000;
-}
-
-uint32_t dyld_get_program_sdk_watch_os_version()
-{
-	if ( gUseDyld3 )
-		return dyld3::dyld_get_program_sdk_watch_os_version();
-
-	const mach_header* mh = (mach_header*)_NSGetMachExecuteHeader();
-	uint32_t platform;
-	uint32_t minOS;
-	uint32_t sdk;
-
-	if ( getVersionLoadCommandInfo(mh, &platform, &minOS, &sdk) ) {
-		if ( platform == PLATFORM_WATCHOS )
-				return sdk;
-	}
-	return 0;
-}
-
-uint32_t dyld_get_program_min_watch_os_version()
-{
-	if ( gUseDyld3 )
-		return dyld3::dyld_get_program_min_watch_os_version();
-
-	const mach_header* mh = (mach_header*)_NSGetMachExecuteHeader();
-	uint32_t platform;
-	uint32_t minOS;
-	uint32_t sdk;
-
-	if ( getVersionLoadCommandInfo(mh, &platform, &minOS, &sdk) ) {
-		if ( platform == PLATFORM_WATCHOS )
-				return minOS;  // return raw minOS (not mapped to iOS version)
-	}
-	return 0;
-}
-
-#endif
-
-
-
 #if TARGET_OS_BRIDGE
-static uint32_t bridgeVersToIOSVers(uint32_t vers)
-{
-	return vers + 0x00090000;
-}
-
 uint32_t dyld_get_program_sdk_bridge_os_version()
 {
-	const mach_header* mh = (mach_header*)_NSGetMachExecuteHeader();
-	uint32_t platform;
-	uint32_t minOS;
-	uint32_t sdk;
-
-	if ( getVersionLoadCommandInfo(mh, &platform, &minOS, &sdk) ) {
-		if ( platform == PLATFORM_BRIDGEOS )
-				return sdk;
-	}
-	return 0;
+    if (gUseDyld3)
+        return dyld3::dyld_get_program_sdk_bridge_os_version();
+
+    __block uint32_t retval = 0;
+    __block bool versionFound = false;
+    dyld3::dyld_get_image_versions((mach_header*)_NSGetMachExecuteHeader(), ^(dyld_platform_t platform, uint32_t sdk_version, uint32_t min_version) {
+        if (versionFound) return;
+
+        if (dyld_get_base_platform(platform) == PLATFORM_BRIDGEOS) {
+            versionFound = true;
+            retval = sdk_version;
+        }
+    });
+
+    return retval;
 }
 
 uint32_t dyld_get_program_min_bridge_os_version()
 {
-	const mach_header* mh = (mach_header*)_NSGetMachExecuteHeader();
-	uint32_t platform;
-	uint32_t minOS;
-	uint32_t sdk;
-
-	if ( getVersionLoadCommandInfo(mh, &platform, &minOS, &sdk) ) {
-		if ( platform == PLATFORM_BRIDGEOS )
-				return minOS;  // return raw minOS (not mapped to iOS version)
-	}
-	return 0;
-}
-
+    if (gUseDyld3)
+        return dyld3::dyld_get_program_min_bridge_os_version();
+
+    __block uint32_t retval = 0;
+    __block bool versionFound = false;
+    dyld3::dyld_get_image_versions((mach_header*)_NSGetMachExecuteHeader(), ^(dyld_platform_t platform, uint32_t sdk_version, uint32_t min_version) {
+        if (versionFound) return;
+
+        if (dyld_get_base_platform(platform) == PLATFORM_BRIDGEOS) {
+            versionFound = true;
+            retval = min_version;
+        }
+    });
+
+    return retval;
+}
 #endif
 
 /*
@@ -801,112 +574,23 @@
  */
 uint32_t dyld_get_sdk_version(const mach_header* mh)
 {
-	if ( gUseDyld3 )
-		return dyld3::dyld_get_sdk_version(mh);
-
-    uint32_t platform;
-	uint32_t minOS;
-	uint32_t sdk;
-
-	if ( getVersionLoadCommandInfo(mh, &platform, &minOS, &sdk) ) {
-		switch (platform) {
-#if TARGET_OS_BRIDGE
-			case PLATFORM_BRIDGEOS:
-				// new binary. sdk version looks like "2.0" but API wants "11.0"
-				return bridgeVersToIOSVers(sdk);
-			case PLATFORM_IOS:
-				// old binary. sdk matches API semantics so can return directly.
-				return sdk;
-#elif __WATCH_OS_VERSION_MIN_REQUIRED
-			case PLATFORM_WATCHOS:
-				// new binary. sdk version looks like "2.0" but API wants "9.0"
-				return watchVersToIOSVers(sdk);
-			case PLATFORM_IOS:
-				// old binary. sdk matches API semantics so can return directly.
-				return sdk;
-#elif __TV_OS_VERSION_MIN_REQUIRED
-			case PLATFORM_TVOS:
-			case PLATFORM_IOS:
-				return sdk;
-#elif __IPHONE_OS_VERSION_MIN_REQUIRED
-			case PLATFORM_IOS:
-				if ( sdk != 0 )	// old binaries might not have SDK set
-					return sdk;
-				break;
-#else
-			case PLATFORM_MACOS:
-				if ( sdk != 0 )	// old binaries might not have SDK set
-					return sdk;
-				break;
-#endif
-		}
-	}
-
-#if __WATCH_OS_VERSION_MIN_REQUIRED || __TV_OS_VERSION_MIN_REQUIRED || TARGET_OS_BRIDGE
-	// All WatchOS and tv OS binaries should have version load command.
-	return 0;
-#else
-	// MacOSX and iOS have old binaries without version load commmand.
-	return deriveSDKVersFromDylibs(mh);
-#endif
+    return dyld3::dyld_get_sdk_version(mh);
 }
 
 uint32_t dyld_get_program_sdk_version()
 {
-	if ( gUseDyld3 )
-		return dyld3::dyld_get_program_sdk_version();
-
-	return dyld_get_sdk_version((mach_header*)_NSGetMachExecuteHeader());
+    return dyld3::dyld_get_sdk_version((mach_header*)_NSGetMachExecuteHeader());
 }
 
 uint32_t dyld_get_min_os_version(const struct mach_header* mh)
 {
-	if ( gUseDyld3 )
-		return dyld3::dyld_get_min_os_version(mh);
-
-	uint32_t platform;
-	uint32_t minOS;
-	uint32_t sdk;
-
-	if ( getVersionLoadCommandInfo(mh, &platform, &minOS, &sdk) ) {
-		switch (platform) {
-#if TARGET_OS_BRIDGE
-			case PLATFORM_BRIDGEOS:
-				// new binary. sdk version looks like "2.0" but API wants "11.0"
-				return bridgeVersToIOSVers(minOS);
-			case PLATFORM_IOS:
-				// old binary. sdk matches API semantics so can return directly.
-				return minOS;
-#elif __WATCH_OS_VERSION_MIN_REQUIRED
-			case PLATFORM_WATCHOS:
-				// new binary. OS version looks like "2.0" but API wants "9.0"
-				return watchVersToIOSVers(minOS);
-			case PLATFORM_IOS:
-				// old binary. OS matches API semantics so can return directly.
-				return minOS;
-#elif __TV_OS_VERSION_MIN_REQUIRED
-			case PLATFORM_TVOS:
-			case PLATFORM_IOS:
-				return minOS;
-#elif __IPHONE_OS_VERSION_MIN_REQUIRED
-			case PLATFORM_IOS:
-				return minOS;
-#else
-			case PLATFORM_MACOS:
-				return minOS;
-#endif
-		}
-	}
-	return 0;
+    return dyld3::dyld_get_min_os_version(mh);
 }
 
 
 uint32_t dyld_get_program_min_os_version()
 {
-	if ( gUseDyld3 )
-		return dyld3::dyld_get_program_min_os_version();
-
-	return dyld_get_min_os_version((mach_header*)_NSGetMachExecuteHeader());
+    return dyld3::dyld_get_min_os_version((mach_header*)_NSGetMachExecuteHeader());
 }
 
 
@@ -941,6 +625,49 @@
 	return false;
 }
 
+dyld_platform_t dyld_get_active_platform(void) {
+    if (gUseDyld3) { return dyld3::dyld_get_active_platform(); }
+    if (_dyld_get_all_image_infos()->version >= 16) { return (dyld_platform_t)_dyld_get_all_image_infos()->platform; }
+
+    __block dyld_platform_t result;
+    // FIXME: Remove this once we only care about version 16 or greater all image infos
+    dyld3::dyld_get_image_versions((mach_header*)_NSGetMachExecuteHeader(), ^(dyld_platform_t platform, uint32_t sdk_version, uint32_t min_version) {
+        result = platform;
+    });
+    return result;
+}
+
+dyld_platform_t dyld_get_base_platform(dyld_platform_t platform) {
+    return dyld3::dyld_get_base_platform(platform);
+}
+
+bool dyld_is_simulator_platform(dyld_platform_t platform) {
+    return dyld3::dyld_is_simulator_platform(platform);
+}
+
+bool dyld_sdk_at_least(const struct mach_header* mh, dyld_build_version_t version) {
+    return dyld3::dyld_sdk_at_least(mh, version);
+}
+
+bool dyld_minos_at_least(const struct mach_header* mh, dyld_build_version_t version) {
+    return dyld3::dyld_minos_at_least(mh, version);
+}
+
+bool dyld_program_sdk_at_least(dyld_build_version_t version) {
+    return dyld3::dyld_sdk_at_least((mach_header*)_NSGetMachExecuteHeader(),version);
+}
+
+bool dyld_program_minos_at_least(dyld_build_version_t version) {
+    return dyld3::dyld_minos_at_least((mach_header*)_NSGetMachExecuteHeader(), version);
+}
+
+// Function that walks through the load commands and calls the internal block for every version found
+// Intended as a fallback for very complex (and rare) version checks, or for tools that need to
+// print our everything for diagnostic reasons
+void dyld_get_image_versions(const struct mach_header* mh, void (^callback)(dyld_platform_t platform, uint32_t sdk_version, uint32_t min_version)) {
+    dyld3::dyld_get_image_versions(mh, callback);
+}
+
 
 
 #if DEPRECATED_APIS_SUPPORTED
@@ -981,6 +708,15 @@
 size_t size, 
 NSObjectFileImage *objectFileImage)
 {
+    // <rdar://problem/51812762> NSCreatObjectFileImageFromMemory fail opaquely if Hardened runtime is enabled
+    uint32_t flags;
+    if ( csops(0, CS_OPS_STATUS, &flags, sizeof(flags)) != -1 ) {
+        if ( (flags & (CS_ENFORCEMENT|CS_KILL)) == (CS_ENFORCEMENT|CS_KILL) ) {
+            //fprintf(stderr, "dyld: warning: NSCreatObjectFileImageFromMemory() cannot be used in harden process 0x%08X\n", flags);
+            return NSObjectFileImageAccess;
+        }
+    }
+
 	if ( gUseDyld3 )
 		return dyld3::NSCreateObjectFileImageFromMemory(address, size, objectFileImage);
 
@@ -1524,15 +1260,8 @@
 // SPI in Mac OS X 10.6
 intptr_t _dyld_get_image_slide(const struct mach_header* mh)
 {
-	if ( gUseDyld3 )
-		return dyld3::_dyld_get_image_slide(mh);
-
-	DYLD_NO_LOCK_THIS_BLOCK;
-    static intptr_t (*p)(const struct mach_header*) = NULL;
-
-	if(p == NULL)
-	    _dyld_func_lookup("__dyld_get_image_slide", (void**)&p);
-	return(p(mh));
+	// always use dyld3 version because it does better error handling
+	return dyld3::_dyld_get_image_slide(mh);
 }
 
 
@@ -1593,7 +1322,6 @@
 #include <pthread.h>
 #include <stdlib.h>
 #include <mach-o/dyld.h>
-#include <servers/bootstrap.h>
 #include "dyldLibSystemInterface.h"
 
 
@@ -1648,16 +1376,29 @@
 	return (pthread_getspecific(dlerrorPerThreadKey) != NULL);
 }
 
+#if TARGET_OS_DRIVERKIT
+static bool isLaunchdOwned()
+{
+    return false;
+}
+#else
 // use non-lazy pointer to vproc_swap_integer so that lazy binding does not recurse
 typedef vproc_err_t (*vswapproc)(vproc_t vp, vproc_gsk_t key,int64_t *inval, int64_t *outval);
 static vswapproc swapProc = &vproc_swap_integer;
 
 static bool isLaunchdOwned()
 {
-	int64_t val = 0;
-	(*swapProc)(NULL, VPROC_GSK_IS_MANAGED, NULL, &val);
-	return ( val != 0 );
-}
+    static bool checked = false;
+    static bool result = false;
+    if ( !checked ) {
+        checked = true;
+	    int64_t val = 0;
+	    (*swapProc)(NULL, VPROC_GSK_IS_MANAGED, NULL, &val);
+	    result = ( val != 0 );
+    }
+    return result;
+}
+#endif
 
 static void shared_cache_missing()
 {
@@ -1685,9 +1426,9 @@
 									&vm_allocate,
 									&mmap,
 									&__cxa_finalize_ranges
-									};
-
-
+                                    };
+
+static const objc_opt::objc_opt_t* gObjCOpt = nullptr;
 //
 // during initialization of libSystem this routine will run
 // and call dyld, registering the helper functions.
@@ -1697,8 +1438,21 @@
 {	
    void (*p)(dyld::LibSystemHelpers*);
 
+    // Get the optimized objc pointer now that the cache is loaded
+    const dyld_all_image_infos* allInfo = _dyld_get_all_image_infos();
+    if ( allInfo != nullptr  ) {
+        const DyldSharedCache* cache = (const DyldSharedCache*)(allInfo->sharedCacheBaseAddress);
+        if ( cache != nullptr )
+            gObjCOpt = cache->objcOpt();
+    }
+
 	if ( gUseDyld3 ) {
 		dyld3::gAllImages.applyInitialImages();
+#if TARGET_OS_IOS && !TARGET_OS_SIMULATOR
+        // For binaries built before 13.0, set the lookup function if they need it
+        if (dyld_get_program_sdk_version() < DYLD_PACKED_VERSION(13,0,0))
+            setLookupFunc((void*)&dyld3::compatFuncLookup);
+#endif
 	}
 	else {
 		_dyld_func_lookup("__dyld_register_thread_helpers", (void**)&p);
@@ -1709,7 +1463,27 @@
 	tlv_initializer();
 }
 
-
+int dladdr(const void* addr, Dl_info* info)
+{
+    dyld3::ScopedTimer timer(DBG_DYLD_TIMING_DLADDR, (uint64_t)addr, 0, 0);
+    int result = 0;
+    if ( gUseDyld3 ) {
+        result = dyld3::dladdr(addr, info);
+    } else {
+        DYLD_LOCK_THIS_BLOCK;
+        static int (*p)(const void* , Dl_info*) = NULL;
+
+        if(p == NULL)
+            _dyld_func_lookup("__dyld_dladdr", (void**)&p);
+        result = p(addr, info);
+    }
+    timer.setData4(result);
+    timer.setData5(info != NULL ? info->dli_fbase : 0);
+    timer.setData6(info != NULL ? info->dli_saddr : 0);
+    return result;
+}
+
+#if !TARGET_OS_DRIVERKIT
 char* dlerror()
 {
 	if ( gUseDyld3 )
@@ -1723,78 +1497,96 @@
 	return(p());
 }
 
-int dladdr(const void* addr, Dl_info* info)
-{
-	if ( gUseDyld3 )
-		return dyld3::dladdr(addr, info);
-
-	DYLD_LOCK_THIS_BLOCK;
-    static int (*p)(const void* , Dl_info*) = NULL;
-
-	if(p == NULL)
-	    _dyld_func_lookup("__dyld_dladdr", (void**)&p);
-	return(p(addr, info));
-}
-
 int dlclose(void* handle)
 {
-	if ( gUseDyld3 )
+    dyld3::ScopedTimer timer(DBG_DYLD_TIMING_DLCLOSE, (uint64_t)handle, 0, 0);
+    int result = 0;
+    if ( gUseDyld3 ) {
+        timer.setData4(result);
 		return dyld3::dlclose(handle);
+    }
 
 	DYLD_LOCK_THIS_BLOCK;
     static int (*p)(void* handle) = NULL;
 
 	if(p == NULL)
 	    _dyld_func_lookup("__dyld_dlclose", (void**)&p);
-	return(p(handle));
+    result = p(handle);
+    timer.setData4(result);
+	return result;
 }
 
 void* dlopen(const char* path, int mode)
-{	
-	if ( gUseDyld3 )
-		return dyld3::dlopen(path, mode);
-
-	// dlopen is special. locking is done inside dyld to allow initializer to run without lock
-	DYLD_NO_LOCK_THIS_BLOCK;
-	
-    static void* (*p)(const char* path, int) = NULL;
-
-	if(p == NULL)
-	    _dyld_func_lookup("__dyld_dlopen", (void**)&p);
-	void* result = p(path, mode);
-	// use asm block to prevent tail call optimization
-	// this is needed because dlopen uses __builtin_return_address() and depends on this glue being in the frame chain
-	// <rdar://problem/5313172 dlopen() looks too far up stack, can cause crash>
-	__asm__ volatile(""); 
-	
+{
+    dyld3::ScopedTimer timer(DBG_DYLD_TIMING_DLOPEN, path, mode, 0);
+    void* result = nullptr;
+
+    if ( gUseDyld3 ) {
+        result = dyld3::dlopen_internal(path, mode, __builtin_return_address(0));
+        timer.setData4(result);
+        return result;
+    }
+
+    // dlopen is special. locking is done inside dyld to allow initializer to run without lock
+    DYLD_NO_LOCK_THIS_BLOCK;
+
+    static void* (*p)(const char* path, int, void*) = NULL;
+
+    if(p == NULL)
+        _dyld_func_lookup("__dyld_dlopen_internal", (void**)&p);
+    result = p(path, mode, __builtin_return_address(0));
+    // use asm block to prevent tail call optimization
+    // this is needed because dlopen uses __builtin_return_address() and depends on this glue being in the frame chain
+    // <rdar://problem/5313172 dlopen() looks too far up stack, can cause crash>
+    __asm__ volatile("");
+    timer.setData4(result);
+
 	return result;
 }
 
 bool dlopen_preflight(const char* path)
 {
-	if ( gUseDyld3 )
-		return dyld3::dlopen_preflight(path);
-
-	DYLD_LOCK_THIS_BLOCK;
-    static bool (*p)(const char* path) = NULL;
-
-	if(p == NULL)
-	    _dyld_func_lookup("__dyld_dlopen_preflight", (void**)&p);
-	return(p(path));
+    dyld3::ScopedTimer timer(DBG_DYLD_TIMING_DLOPEN_PREFLIGHT, path, 0, 0);
+    bool result = false;
+
+    if ( gUseDyld3 ) {
+        result = dyld3::dlopen_preflight_internal(path);
+        timer.setData4(result);
+        return result;
+    }
+
+    DYLD_LOCK_THIS_BLOCK;
+    static bool (*p)(const char* path, void* callerAddress) = NULL;
+
+    if(p == NULL)
+        _dyld_func_lookup("__dyld_dlopen_preflight_internal", (void**)&p);
+    result = p(path, __builtin_return_address(0));
+    timer.setData4(result);
+    return result;
 }
 
 void* dlsym(void* handle, const char* symbol)
 {
-	if ( gUseDyld3 )
-		return dyld3::dlsym(handle, symbol);
-
-	DYLD_LOCK_THIS_BLOCK;
-    static void* (*p)(void* handle, const char* symbol) = NULL;
-
-	if(p == NULL)
-	    _dyld_func_lookup("__dyld_dlsym", (void**)&p);
-	return(p(handle, symbol));
-}
+    dyld3::ScopedTimer timer(DBG_DYLD_TIMING_DLSYM, handle, symbol, 0);
+    void* result = nullptr;
+
+    if ( gUseDyld3 ) {
+        result = dyld3::dlsym_internal(handle, symbol, __builtin_return_address(0));
+        timer.setData4(result);
+        return result;
+    }
+
+    DYLD_LOCK_THIS_BLOCK;
+    static void* (*p)(void* handle, const char* symbol, void *callerAddress) = NULL;
+
+    if(p == NULL)
+        _dyld_func_lookup("__dyld_dlsym_internal", (void**)&p);
+    result = p(handle, symbol, __builtin_return_address(0));
+    timer.setData4(result);
+    return result;
+}
+#endif // !TARGET_OS_DRIVERKIT
+
 
 const struct dyld_all_image_infos* _dyld_get_all_image_infos()
 {
@@ -1905,6 +1697,77 @@
 	return p(length);
 }
 
+bool _dyld_shared_cache_optimized()
+{
+    if ( gUseDyld3 )
+        return dyld3::_dyld_shared_cache_optimized();
+
+    const dyld_all_image_infos* allInfo = _dyld_get_all_image_infos();
+    if ( allInfo != nullptr  ) {
+        const dyld_cache_header* cacheHeader = (dyld_cache_header*)(allInfo->sharedCacheBaseAddress);
+        if ( cacheHeader != nullptr )
+            return (cacheHeader->cacheType == kDyldSharedCacheTypeProduction);
+    }
+    return false;
+}
+
+bool _dyld_shared_cache_is_locally_built()
+{
+    if ( gUseDyld3 )
+        return dyld3::_dyld_shared_cache_is_locally_built();
+
+    const dyld_all_image_infos* allInfo = _dyld_get_all_image_infos();
+    if ( allInfo != nullptr  ) {
+        const dyld_cache_header* cacheHeader = (dyld_cache_header*)(allInfo->sharedCacheBaseAddress);
+        if ( cacheHeader != nullptr )
+            return (cacheHeader->locallyBuiltCache == 1);
+    }
+    return false;
+}
+
+void _dyld_images_for_addresses(unsigned count, const void* addresses[], struct dyld_image_uuid_offset infos[])
+{
+    if ( gUseDyld3 )
+        return dyld3::_dyld_images_for_addresses(count, addresses, infos);
+
+    DYLD_NO_LOCK_THIS_BLOCK;
+    static const void (*p)(unsigned, const void*[], struct dyld_image_uuid_offset[]) = NULL;
+
+    if(p == NULL)
+        _dyld_func_lookup("__dyld_images_for_addresses", (void**)&p);
+    return p(count, addresses, infos);
+}
+
+void _dyld_register_for_image_loads(void (*func)(const mach_header* mh, const char* path, bool unloadable))
+{
+    if ( gUseDyld3 )
+        return dyld3::_dyld_register_for_image_loads(func);
+
+    DYLD_NO_LOCK_THIS_BLOCK;
+    static const void (*p)(void (*)(const mach_header* mh, const char* path, bool unloadable)) = NULL;
+
+    if(p == NULL)
+        _dyld_func_lookup("__dyld_register_for_image_loads", (void**)&p);
+    return p(func);
+}
+
+void _dyld_register_for_bulk_image_loads(void (*func)(unsigned imageCount, const struct mach_header* mhs[], const char* paths[]))
+{
+    if ( gUseDyld3 )
+        return dyld3::_dyld_register_for_bulk_image_loads(func);
+
+    DYLD_NO_LOCK_THIS_BLOCK;
+    static const void (*p)(void (*)(unsigned imageCount, const mach_header* mhs[], const char* paths[])) = NULL;
+
+    if(p == NULL)
+        _dyld_func_lookup("__dyld_register_for_bulk_image_loads", (void**)&p);
+    return p(func);
+}
+
+bool dyld_need_closure(const char* execPath, const char* tempDir)
+{
+    return dyld3::dyld_need_closure(execPath, tempDir);
+}
 
 bool dyld_process_is_restricted()
 {
@@ -1932,6 +1795,19 @@
 	return p();
 }
 
+bool dyld_has_inserted_or_interposing_libraries()
+{
+	if ( gUseDyld3 )
+		return dyld3::dyld_has_inserted_or_interposing_libraries();
+
+	DYLD_NO_LOCK_THIS_BLOCK;
+	static bool (*p)() = NULL;
+
+	if (p == NULL)
+	    _dyld_func_lookup("__dyld_has_inserted_or_interposing_libraries", (void**)&p);
+	return p();
+}
+
 void dyld_dynamic_interpose(const struct mach_header* mh, const struct dyld_interpose_tuple array[], size_t count)
 {
 	if ( gUseDyld3 )
@@ -1945,6 +1821,19 @@
 	p(mh, array, count);
 }
 
+// SPI called __fork
+void _dyld_atfork_prepare()
+{
+    if ( gUseDyld3 )
+        return dyld3::_dyld_atfork_prepare();
+}
+
+// SPI called __fork
+void _dyld_atfork_parent()
+{
+    if ( gUseDyld3 )
+        return dyld3::_dyld_atfork_parent();
+}
 
 // SPI called __fork
 void _dyld_fork_child()
@@ -1968,7 +1857,7 @@
 	if ( ::stat(path, &statbuf) == -1 )
 		return NULL;
 
-	if ( statbuf.st_size < length )
+	if ( (size_t)statbuf.st_size < length )
 		return NULL;
 
 	int cache_fd = ::open(path, O_RDONLY);
@@ -2124,7 +2013,45 @@
 	p(mapped, init, unmapped);
 }
 
-
-
-
-
+void _dyld_missing_symbol_abort()
+{
+    return dyld3::_dyld_missing_symbol_abort();
+}
+
+const char* _dyld_get_objc_selector(const char* selName)
+{
+    // Check the shared cache table if it exists.
+    if ( gObjCOpt != nullptr ) {
+        if ( const objc_opt::objc_selopt_t* selopt = gObjCOpt->selopt() ) {
+            const char* name = selopt->get(selName);
+            if (name != nullptr)
+                return name;
+        }
+    }
+
+    if ( gUseDyld3 )
+        return dyld3::_dyld_get_objc_selector(selName);
+
+    return nullptr;
+}
+
+void _dyld_for_each_objc_class(const char* className,
+                           void (^callback)(void* classPtr, bool isLoaded, bool* stop)) {
+    if ( gUseDyld3 )
+        return dyld3::_dyld_for_each_objc_class(className, callback);
+}
+
+void _dyld_for_each_objc_protocol(const char* protocolName,
+                                  void (^callback)(void* protocolPtr, bool isLoaded, bool* stop)) {
+    if ( gUseDyld3 )
+        return dyld3::_dyld_for_each_objc_protocol(protocolName, callback);
+}
+
+void _dyld_register_driverkit_main(void (*mainFunc)(void))
+{
+    static bool (*p)(void (*mainFunc)(void)) = NULL;
+
+    if(p == NULL)
+        _dyld_func_lookup("__dyld_register_driverkit_main", (void**)&p);
+   p(mainFunc);
+}