Loading...
--- dyld/dyld-832.7.3/dyld3/shared-cache/mrm_shared_cache_builder.cpp
+++ dyld/dyld-733.6/dyld3/shared-cache/mrm_shared_cache_builder.cpp
@@ -23,10 +23,9 @@
*/
#include "mrm_shared_cache_builder.h"
-#include "SharedCacheBuilder.h"
+#include "CacheBuilder.h"
#include "ClosureFileSystem.h"
#include "FileUtils.h"
-#include "JSONReader.h"
#include <pthread.h>
#include <memory>
#include <vector>
@@ -34,10 +33,10 @@
#include <sys/stat.h>
static const uint64_t kMinBuildVersion = 1; //The minimum version BuildOptions struct we can support
-static const uint64_t kMaxBuildVersion = 2; //The maximum version BuildOptions struct we can support
+static const uint64_t kMaxBuildVersion = 1; //The maximum version BuildOptions struct we can support
static const uint32_t MajorVersion = 1;
-static const uint32_t MinorVersion = 2;
+static const uint32_t MinorVersion = 0;
namespace dyld3 {
namespace closure {
@@ -98,7 +97,7 @@
info.fileContentLen = fileInfo.length;
info.sliceOffset = 0;
info.sliceLen = fileInfo.length;
- info.isOSBinary = true;
+ info.isSipProtected = false;
info.inode = fileInfo.inode;
info.mtime = fileInfo.mtime;
info.unload = nullptr;
@@ -195,7 +194,7 @@
struct BuildInstance {
std::unique_ptr<DyldSharedCache::CreateOptions> options;
- std::unique_ptr<SharedCacheBuilder> builder;
+ std::unique_ptr<CacheBuilder> builder;
std::vector<CacheBuilder::InputFile> inputFiles;
std::vector<const char*> errors;
std::vector<const char*> warnings;
@@ -204,8 +203,6 @@
uint8_t* cacheData = nullptr;
uint64_t cacheSize = 0;
std::string jsonMap;
- std::string macOSMap; // For compatibility with update_dyld_shared_cache's .map file
- std::string macOSMapPath; // Owns the string for the path
std::string cdHash; // Owns the data for the cdHash
std::string cdHashType; // Owns the data for the cdHashType
std::string uuid; // Owns the data for the uuid
@@ -217,36 +214,25 @@
uint64_t size;
};
-struct TranslationResult {
- const uint8_t* data;
- size_t size;
- std::string cdHash;
- std::string path;
- bool bufferWasMalloced;
-};
-
-struct MRMSharedCacheBuilder {
- MRMSharedCacheBuilder(const BuildOptions_v1* options);
+struct SharedCacheBuilder {
+ SharedCacheBuilder(const BuildOptions_v1* options);
const BuildOptions_v1* options;
dyld3::closure::FileSystemMRM fileSystem;
std::string dylibOrderFileData;
std::string dirtyDataOrderFileData;
- void* objcOptimizationsFileData;
- size_t objcOptimizationsFileLength;
// An array of builders and their options as we may have more than one builder for a given device variant.
std::vector<BuildInstance> builders;
// The paths in all of the caches
// We keep this here to own the std::string path data
- std::map<std::string, std::unordered_set<const BuildInstance*>> dylibsInCaches;
+ std::map<std::string, uint32_t> dylibsInCaches;
// The results from all of the builders
// We keep this in a vector to own the data.
- std::vector<FileResult*> fileResults;
- std::vector<FileResult> fileResultStorage;
- std::vector<std::pair<uint64_t, bool>> fileResultBuffers;
+ std::vector<FileResult*> fileResults;
+ std::vector<FileResult> fileResultStorage;
// The results from all of the builders
// We keep this in a vector to own the data.
@@ -287,16 +273,11 @@
}
};
-MRMSharedCacheBuilder::MRMSharedCacheBuilder(const BuildOptions_v1* options)
-: options(options)
-, lock(PTHREAD_MUTEX_INITIALIZER)
-, objcOptimizationsFileData(nullptr)
-, objcOptimizationsFileLength(0)
-{
-
-}
-
-void validiateBuildOptions(const BuildOptions_v1* options, MRMSharedCacheBuilder& builder) {
+SharedCacheBuilder::SharedCacheBuilder(const BuildOptions_v1* options) : options(options), lock(PTHREAD_MUTEX_INITIALIZER) {
+
+}
+
+void validiateBuildOptions(const BuildOptions_v1* options, SharedCacheBuilder& builder) {
if (options->version < kMinBuildVersion) {
builder.error("Builder version %llu is less than minimum supported version of %llu", options->version, kMinBuildVersion);
}
@@ -313,7 +294,6 @@
case Disposition::Unknown:
case Disposition::InternalDevelopment:
case Disposition::Customer:
- case Disposition::InternalMinDevelopment:
break;
default:
builder.error("unknown disposition value");
@@ -350,8 +330,8 @@
*minor = MinorVersion;
}
-struct MRMSharedCacheBuilder* createSharedCacheBuilder(const BuildOptions_v1* options) {
- MRMSharedCacheBuilder* builder = new MRMSharedCacheBuilder(options);
+struct SharedCacheBuilder* createSharedCacheBuilder(const BuildOptions_v1* options) {
+ SharedCacheBuilder* builder = new SharedCacheBuilder(options);
// Check the option struct values are valid
validiateBuildOptions(options, *builder);
@@ -359,10 +339,10 @@
return builder;
}
-bool addFile(struct MRMSharedCacheBuilder* builder, const char* path, uint8_t* data, uint64_t size, FileFlags fileFlags) {
+bool addFile(struct SharedCacheBuilder* builder, const char* path, uint8_t* data, uint64_t size, FileFlags fileFlags) {
__block bool success = false;
builder->runSync(^() {
- if (builder->state != MRMSharedCacheBuilder::AcceptingFiles) {
+ if (builder->state != SharedCacheBuilder::AcceptingFiles) {
builder->error("Cannot add file: '%s' as we have already started building", path);
return;
}
@@ -393,11 +373,6 @@
builder->dirtyDataOrderFileData = std::string((char*)data, size);
success = true;
return;
- case ObjCOptimizationsFile:
- builder->objcOptimizationsFileData = data;
- builder->objcOptimizationsFileLength = size;
- success = true;
- return;
default:
builder->error("unknown file flags value");
break;
@@ -413,10 +388,10 @@
return success;
}
-bool addSymlink(struct MRMSharedCacheBuilder* builder, const char* fromPath, const char* toPath) {
+bool addSymlink(struct SharedCacheBuilder* builder, const char* fromPath, const char* toPath) {
__block bool success = false;
builder->runSync(^() {
- if (builder->state != MRMSharedCacheBuilder::AcceptingFiles) {
+ if (builder->state != SharedCacheBuilder::AcceptingFiles) {
builder->error("Cannot add file: '%s' as we have already started building", fromPath);
return;
}
@@ -440,44 +415,22 @@
return success;
}
-static DyldSharedCache::LocalSymbolsMode platformExcludeLocalSymbols(Platform platform) {
+static bool platformExcludeLocalSymbols(Platform platform) {
switch (platform) {
case Platform::unknown:
case Platform::macOS:
- return DyldSharedCache::LocalSymbolsMode::keep;
+ return false;
case Platform::iOS:
case Platform::tvOS:
case Platform::watchOS:
case Platform::bridgeOS:
- return DyldSharedCache::LocalSymbolsMode::unmap;
+ return true;
case Platform::iOSMac:
case Platform::iOS_simulator:
case Platform::tvOS_simulator:
case Platform::watchOS_simulator:
- return DyldSharedCache::LocalSymbolsMode::keep;
- }
-}
-
-static DyldSharedCache::LocalSymbolsMode excludeLocalSymbols(const BuildOptions_v1* options) {
- if ( options->version >= 2 ) {
- const BuildOptions_v2* v2 = (const BuildOptions_v2*)options;
- if ( v2->optimizeForSize )
- return DyldSharedCache::LocalSymbolsMode::strip;
- }
-
- // Old build options always use the platform default
- return platformExcludeLocalSymbols(options->platform);
-}
-
-static bool optimizeDyldDlopens(const BuildOptions_v1* options) {
- // Old builds always default to dyld3 optimisations
- if ( options->version < 2 ) {
- return true;
- }
-
- // If we want to optimize for size instead of speed, then disable dyld3 dlopen closures
- const BuildOptions_v2* v2 = (const BuildOptions_v2*)options;
- return !v2->optimizeForSize;
+ return false;
+ }
}
static DyldSharedCache::CodeSigningDigestMode platformCodeSigningDigestMode(Platform platform) {
@@ -528,25 +481,19 @@
}
}
-// This is a JSON file containing the list of classes for which
-// we should try to build IMP caches.
-dyld3::json::Node parseObjcOptimizationsFile(Diagnostics& diags, const void* data, size_t length) {
- return dyld3::json::readJSON(diags, data, length);
-}
-
-bool runSharedCacheBuilder(struct MRMSharedCacheBuilder* builder) {
+bool runSharedCacheBuilder(struct SharedCacheBuilder* builder) {
__block bool success = false;
builder->runSync(^() {
- if (builder->state != MRMSharedCacheBuilder::AcceptingFiles) {
+ if (builder->state != SharedCacheBuilder::AcceptingFiles) {
builder->error("Builder has already been run");
return;
}
- builder->state = MRMSharedCacheBuilder::Building;
+ builder->state = SharedCacheBuilder::Building;
if (builder->fileSystem.fileCount() == 0) {
builder->error("Cannot run builder with no files");
}
- __block Diagnostics diag;
+ Diagnostics diag;
std::vector<DyldSharedCache::FileAlias> aliases = builder->fileSystem.getResolvedSymlinks(diag);
if (diag.hasError()) {
diag.verbose("Symlink resolver error: %s\n", diag.errorMessage().c_str());
@@ -557,49 +504,42 @@
return;
}
- __block std::vector<SharedCacheBuilder::InputFile> inputFiles;
+ __block std::vector<CacheBuilder::InputFile> inputFiles;
builder->fileSystem.forEachFileInfo(^(const char* path, FileFlags fileFlags) {
- SharedCacheBuilder::InputFile::State state = SharedCacheBuilder::InputFile::Unset;
+ CacheBuilder::InputFile::State state = CacheBuilder::InputFile::Unset;
switch (fileFlags) {
case FileFlags::NoFlags:
- state = SharedCacheBuilder::InputFile::Unset;
+ state = CacheBuilder::InputFile::Unset;
break;
case FileFlags::MustBeInCache:
- state = SharedCacheBuilder::InputFile::MustBeIncluded;
+ state = CacheBuilder::InputFile::MustBeIncluded;
break;
case FileFlags::ShouldBeExcludedFromCacheIfUnusedLeaf:
- state = SharedCacheBuilder::InputFile::MustBeExcludedIfUnused;
+ state = CacheBuilder::InputFile::MustBeExcludedIfUnused;
break;
case FileFlags::RequiredClosure:
- state = SharedCacheBuilder::InputFile::MustBeIncluded;
+ state = CacheBuilder::InputFile::MustBeIncluded;
break;
case FileFlags::DylibOrderFile:
case FileFlags::DirtyDataOrderFile:
- case FileFlags::ObjCOptimizationsFile:
builder->error("Order files should not be in the file system");
return;
}
- inputFiles.emplace_back((SharedCacheBuilder::InputFile){ path, state });
+ inputFiles.emplace_back((CacheBuilder::InputFile){ path, state });
});
auto addCacheConfiguration = ^(bool isOptimized) {
for (uint64_t i = 0; i != builder->options->numArchs; ++i) {
- // HACK: Skip i386 for macOS
- if ( (builder->options->platform == Platform::macOS) && (strcmp(builder->options->archs[i], "i386") == 0 ) )
- continue;
auto options = std::make_unique<DyldSharedCache::CreateOptions>((DyldSharedCache::CreateOptions){});
const char *cacheSuffix = (isOptimized ? "" : ".development");
- if ( builder->options->platform == Platform::macOS )
- cacheSuffix = "";
- std::string runtimePath = (builder->options->platform == Platform::macOS) ? MACOSX_MRM_DYLD_SHARED_CACHE_DIR : IPHONE_DYLD_SHARED_CACHE_DIR;
+ std::string runtimePath = (builder->options->platform == Platform::macOS) ? "/private/var/db/dyld/" : "/System/Library/Caches/com.apple.dyld/";
options->outputFilePath = runtimePath + "dyld_shared_cache_" + builder->options->archs[i] + cacheSuffix;
options->outputMapFilePath = options->outputFilePath + ".json";
options->archs = &dyld3::GradedArchs::forName(builder->options->archs[i]);
options->platform = (dyld3::Platform)builder->options->platform;
- options->localSymbolMode = excludeLocalSymbols(builder->options);
+ options->excludeLocalSymbols = platformExcludeLocalSymbols(builder->options->platform);
options->optimizeStubs = isOptimized;
- options->optimizeDyldDlopens = optimizeDyldDlopens(builder->options);
- options->optimizeDyldLaunches = true;
+ options->optimizeObjC = true;
options->codeSigningDigestMode = platformCodeSigningDigestMode(builder->options->platform);
options->dylibsRemovedDuringMastering = true;
options->inodesAreSameAsRuntime = false;
@@ -611,9 +551,8 @@
options->loggingPrefix = std::string(builder->options->deviceName) + dispositionName(builder->options->disposition) + "." + builder->options->archs[i] + cacheSuffix;
options->dylibOrdering = parseOrderFile(builder->dylibOrderFileData);
options->dirtyDataSegmentOrdering = parseOrderFile(builder->dirtyDataOrderFileData);
- options->objcOptimizations = parseObjcOptimizationsFile(diag, builder->objcOptimizationsFileData, builder->objcOptimizationsFileLength);
-
- auto cacheBuilder = std::make_unique<SharedCacheBuilder>(*options.get(), builder->fileSystem);
+
+ auto cacheBuilder = std::make_unique<CacheBuilder>(*options.get(), builder->fileSystem);
builder->builders.emplace_back((BuildInstance) { std::move(options), std::move(cacheBuilder), inputFiles });
}
};
@@ -622,13 +561,8 @@
switch (builder->options->disposition) {
case Disposition::Unknown:
case Disposition::InternalDevelopment:
- // HACK: MRM for the mac should only get development, even if it requested both
- if (builder->options->platform == Platform::macOS) {
- addCacheConfiguration(false);
- } else {
- addCacheConfiguration(false);
- addCacheConfiguration(true);
- }
+ addCacheConfiguration(false);
+ addCacheConfiguration(true);
break;
case Disposition::Customer:
addCacheConfiguration(true);
@@ -640,7 +574,7 @@
// FIXME: This step can run in parallel.
for (auto& buildInstance : builder->builders) {
- SharedCacheBuilder* cacheBuilder = buildInstance.builder.get();
+ CacheBuilder* cacheBuilder = buildInstance.builder.get();
cacheBuilder->build(buildInstance.inputFiles, aliases);
// First put the warnings in to a vector to own them.
@@ -665,12 +599,7 @@
if (cacheBuilder->errorMessage().empty()) {
cacheBuilder->writeBuffer(buildInstance.cacheData, buildInstance.cacheSize);
- buildInstance.jsonMap = cacheBuilder->getMapFileJSONBuffer(builder->options->deviceName);
- if ( buildInstance.options->platform == dyld3::Platform::macOS ) {
- // For compatibility with update_dyld_shared_cache, put a .map file next to the shared cache
- buildInstance.macOSMap = cacheBuilder->getMapFileBuffer();
- buildInstance.macOSMapPath = buildInstance.options->outputFilePath + ".map";
- }
+ buildInstance.jsonMap = cacheBuilder->getMapFileBuffer(builder->options->deviceName);
buildInstance.cdHash = cacheBuilder->cdHashFirst();
buildInstance.uuid = cacheBuilder->uuid();
switch (buildInstance.options->codeSigningDigestMode) {
@@ -684,23 +613,14 @@
buildInstance.cdHashType = "sha1";
break;
}
-
- // Track the dylibs which were included in this cache
- cacheBuilder->forEachCacheDylib(^(const std::string &path) {
- builder->dylibsInCaches[path.c_str()].insert(&buildInstance);
- });
- cacheBuilder->forEachCacheSymlink(^(const std::string &path) {
- builder->dylibsInCaches[path.c_str()].insert(&buildInstance);
- });
}
- // Free the cache builder now so that we don't keep too much memory resident
- cacheBuilder->deleteBuffer();
- buildInstance.builder.reset();
}
// Now that we have run all of the builds, collect the results
// First push file results for each of the shared caches we built
for (auto& buildInstance : builder->builders) {
+ CacheBuilder* cacheBuilder = buildInstance.builder.get();
+
CacheResult cacheBuildResult;
cacheBuildResult.version = 1;
cacheBuildResult.loggingPrefix = buildInstance.options->loggingPrefix.c_str();
@@ -714,7 +634,7 @@
builder->cacheResultStorage.emplace_back(cacheBuildResult);
- if (!buildInstance.errors.empty())
+ if (!cacheBuilder->errorMessage().empty())
continue;
FileResult cacheFileResult;
@@ -727,23 +647,11 @@
cacheFileResult.hashType = buildInstance.cdHashType.c_str();
cacheFileResult.hash = buildInstance.cdHash.c_str();
- builder->fileResultBuffers.push_back({ builder->fileResultStorage.size(), true });
builder->fileResultStorage.emplace_back(cacheFileResult);
- // Add a file result for the .map file
- if ( !buildInstance.macOSMap.empty() ) {
- FileResult cacheFileResult;
- cacheFileResult.version = 1;
- cacheFileResult.path = buildInstance.macOSMapPath.c_str();
- cacheFileResult.behavior = AddFile;
- cacheFileResult.data = (const uint8_t*)buildInstance.macOSMap.data();
- cacheFileResult.size = buildInstance.macOSMap.size();
- cacheFileResult.hashArch = buildInstance.options->archs->name();
- cacheFileResult.hashType = buildInstance.cdHashType.c_str();
- cacheFileResult.hash = buildInstance.cdHash.c_str();
-
- builder->fileResultStorage.emplace_back(cacheFileResult);
- }
+ cacheBuilder->forEachCacheDylib(^(const std::string &path) {
+ ++builder->dylibsInCaches[path.c_str()];
+ });
}
// Copy from the storage to the vector we can return to the API.
@@ -756,112 +664,59 @@
// Add entries to tell us to remove all of the dylibs from disk which are in every cache.
const size_t numCaches = builder->builders.size();
for (const auto& dylibAndCount : builder->dylibsInCaches) {
- const char* pathToRemove = dylibAndCount.first.c_str();
-
- if ( builder->options->platform == Platform::macOS ) {
- // macOS has to leave the simulator support binaries on disk
- if ( strcmp(pathToRemove, "/usr/lib/system/libsystem_kernel.dylib") == 0 )
- continue;
- if ( strcmp(pathToRemove, "/usr/lib/system/libsystem_platform.dylib") == 0 )
- continue;
- if ( strcmp(pathToRemove, "/usr/lib/system/libsystem_pthread.dylib") == 0 )
- continue;
- }
-
- if (dylibAndCount.second.size() == numCaches) {
- builder->filesToRemove.push_back(pathToRemove);
- } else {
- // File is not in every cache, so likely has perhaps only x86_64h slice
- // but we built both x86_64 and x86_64h caches.
- // We may still delete it if its in all caches it's eligible for, ie, we
- // assume the cache builder knows about all possible arch's on the system and
- // can delete anything it knows can't run
- bool canDeletePath = true;
- for (auto& buildInstance : builder->builders) {
- if ( dylibAndCount.second.count(&buildInstance) != 0 )
- continue;
- // This builder didn't get this image. See if the image was ineligible
- // based on slide, ie, that dyld at runtime couldn't load this anyway, so
- // so removing it from disk won't hurt
- Diagnostics loaderDiag;
- const dyld3::GradedArchs* archs = buildInstance.options->archs;
- dyld3::Platform platform = buildInstance.options->platform;
- char realerPath[MAXPATHLEN];
- dyld3::closure::LoadedFileInfo fileInfo = dyld3::MachOAnalyzer::load(loaderDiag, builder->fileSystem,
- pathToRemove, *archs, platform, realerPath);
- if ( (platform == dyld3::Platform::macOS) && loaderDiag.hasError() ) {
- // Try again with iOSMac
- loaderDiag.clearError();
- fileInfo = dyld3::MachOAnalyzer::load(loaderDiag, builder->fileSystem,
- pathToRemove, *archs, dyld3::Platform::iOSMac, realerPath);
- }
-
- // We don't need the file content now, as we only needed to know if this file could be loaded
- builder->fileSystem.unloadFile(fileInfo);
-
- if ( loaderDiag.hasError() || (fileInfo.fileContent == nullptr) ) {
- // This arch/platform combination couldn't load this path, so we can remove it
- continue;
- }
-
- // This arch was compatible, so the dylib was rejected from this cache for some other reason, eg,
- // cache overflow. We need to keep it on-disk
- canDeletePath = false;
- break;
- }
- if ( canDeletePath )
- builder->filesToRemove.push_back(pathToRemove);
+ if (dylibAndCount.second == numCaches) {
+ builder->filesToRemove.push_back(dylibAndCount.first.c_str());
}
}
// Quit if we had any errors.
for (auto& buildInstance : builder->builders) {
- if (!buildInstance.errors.empty())
+ CacheBuilder* cacheBuilder = buildInstance.builder.get();
+ if (!cacheBuilder->errorMessage().empty())
return;
}
- builder->state = MRMSharedCacheBuilder::FinishedBuilding;
+ builder->state = SharedCacheBuilder::FinishedBuilding;
success = true;
});
return success;
}
-const char* const* getErrors(const struct MRMSharedCacheBuilder* builder, uint64_t* errorCount) {
+const char* const* getErrors(const struct SharedCacheBuilder* builder, uint64_t* errorCount) {
if (builder->errors.empty())
return nullptr;
*errorCount = builder->errors.size();
return builder->errors.data();
}
-const struct FileResult* const* getFileResults(struct MRMSharedCacheBuilder* builder, uint64_t* resultCount) {
+const struct FileResult* const* getFileResults(struct SharedCacheBuilder* builder, uint64_t* resultCount) {
if (builder->fileResults.empty())
return nullptr;
*resultCount = builder->fileResults.size();
return builder->fileResults.data();
}
-const struct CacheResult* const* getCacheResults(struct MRMSharedCacheBuilder* builder, uint64_t* resultCount) {
+const struct CacheResult* const* getCacheResults(struct SharedCacheBuilder* builder, uint64_t* resultCount) {
if (builder->cacheResults.empty())
return nullptr;
*resultCount = builder->cacheResults.size();
return builder->cacheResults.data();
}
-const char* const* getFilesToRemove(const struct MRMSharedCacheBuilder* builder, uint64_t* fileCount) {
+const char* const* getFilesToRemove(const struct SharedCacheBuilder* builder, uint64_t* fileCount) {
if (builder->filesToRemove.empty())
return nullptr;
*fileCount = builder->filesToRemove.size();
return builder->filesToRemove.data();
}
-void destroySharedCacheBuilder(struct MRMSharedCacheBuilder* builder) {
- for (auto &indexAndIsDataMalloced : builder->fileResultBuffers) {
- FileResult& fileResult = builder->fileResultStorage[indexAndIsDataMalloced.first];
- if (indexAndIsDataMalloced.second) {
- free((void*)fileResult.data);
- } else {
- vm_deallocate(mach_task_self(), (vm_address_t)fileResult.data, fileResult.size);
- }
+void destroySharedCacheBuilder(struct SharedCacheBuilder* builder) {
+ for (auto& buildInstance : builder->builders) {
+ CacheBuilder* cacheBuilder = buildInstance.builder.get();
+ cacheBuilder->deleteBuffer();
+ }
+ for (auto &fileResult : builder->fileResultStorage) {
+ free((void*)fileResult.data);
fileResult.data = nullptr;
}
delete builder;