Skip to content

Commit d8c9c31

Browse files
committed
Tidying
1 parent 3369e54 commit d8c9c31

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

Sources/SwiftDriver/Driver/Driver.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2818,7 +2818,7 @@ extension Driver {
28182818
)
28192819
}
28202820

2821-
// Address and memtag sanitizers can not be enabled concurrently.
2821+
// Address and memtag-stack sanitizers can not be enabled concurrently.
28222822
if set.contains(.memtag_stack) && set.contains(.address) {
28232823
diagnosticEngine.emit(
28242824
.error_argument_not_allowed_with(

Sources/SwiftDriver/Toolchains/GenericUnixToolchain.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,11 @@ public final class GenericUnixToolchain: Toolchain {
149149
targetTriple: Triple,
150150
isShared: Bool
151151
) throws -> String? {
152+
guard let runtimeLibraryName = sanitizer.runtimeLibraryName else {
153+
return nil
154+
}
152155
let environment = (targetTriple.environment == .android) ? "-android" : ""
153-
return "libclang_rt.\(sanitizer.runtimeLibraryName)-\(targetTriple.archName)\(environment).a"
156+
return "libclang_rt.\(runtimeLibraryName)-\(targetTriple.archName)\(environment).a"
154157
}
155158

156159
public func addPlatformSpecificCommonFrontendOptions(

Sources/SwiftDriver/Utilities/Sanitizer.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public enum Sanitizer: String, Hashable {
3333
/// Scudo hardened allocator
3434
case scudo
3535

36-
/// Memory tagging sanitizer (MemTag)
36+
/// Memory-Tagging-based stack sanitizer
3737
case memtag_stack = "memtag-stack"
3838

3939
/// Does this sanitizer have a runtime library

0 commit comments

Comments
 (0)