Fix -debug-info-store-invocation-logic on Darwin

owenv · owenv · commit 262419f17791 · 2020-09-05T22:50:33.000-07:00
Fixes DebugInfo/compiler-flags-macosx.swift
diff --git a/Sources/SwiftDriver/Jobs/CompileJob.swift b/Sources/SwiftDriver/Jobs/CompileJob.swift
@@ -199,7 +199,7 @@ extension Driver {
       }
     }
 
-    if parsedOptions.contains(.debugInfoStoreInvocation) &&
+    if parsedOptions.contains(.debugInfoStoreInvocation) ||
        toolchain.shouldStoreInvocationInDebugInfo {
       commandLine.appendFlag(.debugInfoStoreInvocation)
     }
diff --git a/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift b/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift
@@ -108,7 +108,7 @@ public final class DarwinToolchain: Toolchain {
 
   public var shouldStoreInvocationInDebugInfo: Bool {
     // This matches the behavior in Clang.
-    !(env["RC_DEBUG_OPTIONS"]?.isEmpty ?? false)
+    !(env["RC_DEBUG_OPTIONS"]?.isEmpty ?? true)
   }
 
   public func runtimeLibraryName(

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ extension Driver {`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`
`202`		`- if parsedOptions.contains(.debugInfoStoreInvocation) &&`
	`202`	`+ if parsedOptions.contains(.debugInfoStoreInvocation) \|\|`
`203`	`203`	`toolchain.shouldStoreInvocationInDebugInfo {`
`204`	`204`	`commandLine.appendFlag(.debugInfoStoreInvocation)`
`205`	`205`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public final class DarwinToolchain: Toolchain {`
`108`	`108`
`109`	`109`	`public var shouldStoreInvocationInDebugInfo: Bool {`
`110`	`110`	`// This matches the behavior in Clang.`
`111`		`- !(env["RC_DEBUG_OPTIONS"]?.isEmpty ?? false)`
	`111`	`+ !(env["RC_DEBUG_OPTIONS"]?.isEmpty ?? true)`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`public func runtimeLibraryName(`