Skip to content

[5.0 12/12] Revert "[Serialization] Use full target architectures for swiftmodule files" #21440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 20, 2018
Merged

[5.0 12/12] Revert "[Serialization] Use full target architectures for swiftmodule files" #21440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 14 additions & 49 deletions lib/Serialization/SerializedModuleLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,23 +128,6 @@ static void addDiagnosticInfoForArchitectureMismatch(ASTContext &ctx,
archName, foundArchs);
}

static std::pair<llvm::SmallString<16>, llvm::SmallString<16>>
getArchSpecificModuleFileNames(StringRef archName) {
llvm::SmallString<16> archFile, archDocFile;

if (!archName.empty()) {
archFile += archName;
archFile += '.';
archFile += file_types::getExtension(file_types::TY_SwiftModuleFile);

archDocFile += archName;
archDocFile += '.';
archDocFile += file_types::getExtension(file_types::TY_SwiftModuleDocFile);
}

return {archFile, archDocFile};
}

bool
SerializedModuleLoaderBase::findModule(AccessPathElem moduleID,
std::unique_ptr<llvm::MemoryBuffer> *moduleBuffer,
Expand All @@ -160,19 +143,19 @@ SerializedModuleLoaderBase::findModule(AccessPathElem moduleID,
moduleDocFilename +=
file_types::getExtension(file_types::TY_SwiftModuleDocFile);

StringRef archName = Ctx.LangOpts.Target.getArchName();
auto archFileNames = getArchSpecificModuleFileNames(archName);
// FIXME: Which name should we be using here? Do we care about CPU subtypes?
// FIXME: At the very least, don't hardcode "arch".
llvm::SmallString<16> archName{
Ctx.LangOpts.getPlatformConditionValue(PlatformConditionKind::Arch)};
llvm::SmallString<16> archFile{archName};
llvm::SmallString<16> archDocFile{archName};
if (!archFile.empty()) {
archFile += '.';
archFile += file_types::getExtension(file_types::TY_SwiftModuleFile);

// FIXME: We used to use "major architecture" names for these files---the
// names checked in "#if arch(...)". Fall back to that name in the one case
// where it's different from what Swift 4.2 supported: 32-bit ARM platforms.
// We should be able to drop this once there's an Xcode that supports the
// new names.
StringRef alternateArchName;
if (Ctx.LangOpts.Target.getArch() == llvm::Triple::ArchType::arm)
alternateArchName = "arm";
auto alternateArchFileNames =
getArchSpecificModuleFileNames(alternateArchName);
archDocFile += '.';
archDocFile += file_types::getExtension(file_types::TY_SwiftModuleDocFile);
}

llvm::SmallString<128> scratch;
llvm::SmallString<128> currPath;
Expand All @@ -186,19 +169,10 @@ SerializedModuleLoaderBase::findModule(AccessPathElem moduleID,
currPath = path;
llvm::sys::path::append(currPath, moduleFilename.str());
err = openModuleFiles(currPath,
archFileNames.first, archFileNames.second,
archFile.str(), archDocFile.str(),
moduleBuffer, moduleDocBuffer,
scratch);

if (err == std::errc::no_such_file_or_directory &&
!alternateArchName.empty()) {
err = openModuleFiles(currPath,
alternateArchFileNames.first,
alternateArchFileNames.second,
moduleBuffer, moduleDocBuffer,
scratch);
}

if (err == std::errc::no_such_file_or_directory) {
addDiagnosticInfoForArchitectureMismatch(
Ctx, moduleID.second, moduleName, archName, currPath);
Expand All @@ -223,18 +197,9 @@ SerializedModuleLoaderBase::findModule(AccessPathElem moduleID,
}

llvm::sys::path::append(currPath, "Modules", moduleFilename.str());
auto err = openModuleFiles(currPath,
archFileNames.first, archFileNames.second,
auto err = openModuleFiles(currPath, archFile.str(), archDocFile.str(),
moduleBuffer, moduleDocBuffer, scratch);

if (err == std::errc::no_such_file_or_directory &&
!alternateArchName.empty()) {
err = openModuleFiles(currPath,
alternateArchFileNames.first,
alternateArchFileNames.second,
moduleBuffer, moduleDocBuffer, scratch);
}

if (err == std::errc::no_such_file_or_directory) {
addDiagnosticInfoForArchitectureMismatch(
Ctx, moduleID.second, moduleName, archName, currPath);
Expand Down
18 changes: 0 additions & 18 deletions test/Serialization/load-arch-fallback-framework.swift
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions test/Serialization/load-arch-fallback.swift
View file
Open in desktop

This file was deleted.

19 changes: 17 additions & 2 deletions test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,8 @@ elif platform.system() == 'Linux':
if 'swift_interpreter' in config.available_features:
config.available_features.add('swift-remoteast-test')

config.target_swiftmodule_name = "unknown.swiftmodule"
config.target_swiftdoc_name = "unknown.swiftdoc"
config.target_runtime = "unknown"

swift_reflection_test_name = 'swift-reflection-test' + config.variant_suffix
Expand Down Expand Up @@ -607,6 +609,8 @@ def use_interpreter_for_simple_runs():

if run_vendor == 'apple':
config.available_features.add('objc_interop')
config.target_swiftmodule_name = run_cpu + ".swiftmodule"
config.target_swiftdoc_name = run_cpu + ".swiftdoc"
config.target_object_format = "macho"
config.target_dylib_extension = "dylib"
config.target_codesign = "codesign -f -s -"
Expand Down Expand Up @@ -642,6 +646,15 @@ if run_vendor == 'apple':
lit_config.note('Testing watchOS ' + config.variant_triple)
xcrun_sdk_name = "watchos"

if run_cpu == "armv7" or run_cpu == "armv7s" or run_cpu == "armv7k":
config.target_swiftmodule_name = "arm.swiftmodule"
config.target_swiftdoc_name = "arm.swiftdoc"
elif run_cpu == "arm64":
config.target_swiftmodule_name = "arm64.swiftmodule"
config.target_swiftdoc_name = "arm64.swiftdoc"
else:
lit_config.fatal("Unknown CPU '%s'" % run_cpu)

config.target_cc_options = (
"-arch %s -m%s-version-min=%s %s" %
(run_cpu, run_os, run_vers, clang_mcp_opt))
Expand Down Expand Up @@ -796,6 +809,8 @@ elif run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'wi
config.target_object_format = "elf"
config.target_dylib_extension = "so"
config.target_sdk_name = "linux"
config.target_swiftmodule_name = run_cpu + ".swiftmodule"
config.target_swiftdoc_name = run_cpu + ".swiftdoc"
config.target_runtime = "native"
config.target_swift_autolink_extract = inferSwiftBinary("swift-autolink-extract")
config.target_build_swift = (
Expand Down Expand Up @@ -1255,8 +1270,8 @@ else:
config.substitutions.insert(0, ('%platform-module-dir', platform_module_dir))
config.substitutions.insert(0, ('%platform-sdk-overlay-dir', platform_sdk_overlay_dir))

config.substitutions.append(('%target-swiftmodule-name', run_cpu + '.swiftmodule'))
config.substitutions.append(('%target-swiftdoc-name', run_cpu + '.swiftdoc'))
config.substitutions.append(('%target-swiftmodule-name', config.target_swiftmodule_name))
config.substitutions.append(('%target-swiftdoc-name', config.target_swiftdoc_name))

config.substitutions.append(('%target-object-format', config.target_object_format))
config.substitutions.append(('%target-dylib-extension', config.target_dylib_extension))
Expand Down