Skip to content

Add -print-target-info libSwiftScan entry-points #911

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.

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
Jul 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions Sources/CSwiftScan/include/swiftscan_header.h
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,10 @@ typedef struct {
void
(*swiftscan_scan_invocation_dispose)(swiftscan_scan_invocation_t);

//=== Target Info Functions-------- ---------------------------------------===//
swiftscan_string_ref_t
(*swiftscan_compiler_target_info_query)(swiftscan_scan_invocation_t);

//=== Functionality Query Functions ---------------------------------------===//
swiftscan_string_set_t *
(*swiftscan_compiler_supported_arguments_query)(void);
Expand Down
26 changes: 25 additions & 1 deletion Sources/SwiftDriver/SwiftScan/SwiftScan.swift
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public enum DependencyScanningError: Error, DiagnosticData {
}

/// Wrapper for libSwiftScan, taking care of initialization, shutdown, and dispatching dependency scanning queries.
internal final class SwiftScan {
@_spi(Testing) public final class SwiftScan {
/// The path to the libSwiftScan dylib.
let path: AbsolutePath

Expand Down Expand Up @@ -251,6 +251,26 @@ internal final class SwiftScan {
throw DependencyScanningError.argumentQueryFailed
}
}

@_spi(Testing) public func canQueryTargetInfo() -> Bool {
return api.swiftscan_compiler_target_info_query != nil &&
api.swiftscan_string_set_dispose != nil
}

@_spi(Testing) public func queryTargetInfo(invocationCommand: [String])
throws -> FrontendTargetInfo {
// Create and configure the scanner invocation
let invocation = api.swiftscan_scan_invocation_create()
defer { api.swiftscan_scan_invocation_dispose(invocation) }
withArrayOfCStrings(invocationCommand) { invocationStringArray in
api.swiftscan_scan_invocation_set_argv(invocation,
Int32(invocationCommand.count),
invocationStringArray)
}
let targetInfoString = try toSwiftString(api.swiftscan_compiler_target_info_query(invocation))
let targetInfoData = Data(targetInfoString.utf8)
return try JSONDecoder().decode(FrontendTargetInfo.self, from: targetInfoData)
}
}

// Used for testing purposes only
Expand Down Expand Up @@ -290,6 +310,10 @@ private extension swiftscan_functions_t {
self.swiftscan_compiler_supported_features_query =
try loadOptional("swiftscan_compiler_supported_features_query")

// Target Info query
self.swiftscan_compiler_target_info_query =
try loadOptional("swiftscan_compiler_target_info_query")

// Dependency scanner serialization/deserialization features
self.swiftscan_scanner_cache_serialize =
try loadOptional("swiftscan_scanner_cache_serialize")
Expand Down
18 changes: 17 additions & 1 deletion Tests/SwiftDriverTests/SwiftDriverTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4649,7 +4649,7 @@ final class SwiftDriverTests: XCTestCase {

func testPrintTargetInfo() throws {
do {
var driver = try Driver(args: ["swift", "-print-target-info", "-target", "arm64-apple-ios12.0", "-sdk", "bar", "-resource-dir", "baz"])
var driver = try Driver(args: ["swift", "-print-target-info", "-sdk", "bar", "-resource-dir", "baz"])
let plannedJobs = try driver.planBuild()
XCTAssertTrue(plannedJobs.count == 1)
let job = plannedJobs[0]
Expand All @@ -4660,6 +4660,22 @@ final class SwiftDriverTests: XCTestCase {
XCTAssertTrue(job.commandLine.contains(.flag("-resource-dir")))
}

do {
let targetInfoArgs = ["-print-target-info", "-sdk", "bar", "-resource-dir", "baz"]
let driver = try Driver(args: ["swift"] + targetInfoArgs)

let env = ProcessEnv.vars
let swiftScanLibPath = try Driver.getScanLibPath(of: driver.toolchain,
hostTriple: driver.hostTriple,
env: env)
if localFileSystem.exists(swiftScanLibPath) {
let libSwiftScanInstance = try SwiftScan(dylib: swiftScanLibPath)
if libSwiftScanInstance.canQueryTargetInfo() {
let _ = try libSwiftScanInstance.queryTargetInfo(invocationCommand: targetInfoArgs)
}
}
}

do {
struct MockExecutor: DriverExecutor {
let resolver: ArgsResolver
Expand Down