diff --git a/Sources/SwiftDriver/Jobs/CompileJob.swift b/Sources/SwiftDriver/Jobs/CompileJob.swift
index 2c692a4a4..426155366 100644
--- 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
index 0a1c2faf4..e63ed010b 100644
--- 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(