diff --git a/lib/IRGen/IRGenFunction.cpp b/lib/IRGen/IRGenFunction.cpp
index 007aed1e1195f..7e49cc167cf37 100644
--- a/lib/IRGen/IRGenFunction.cpp
+++ b/lib/IRGen/IRGenFunction.cpp
@@ -33,7 +33,7 @@ using namespace swift;
 using namespace irgen;
 
 static llvm::cl::opt<bool> EnableTrapDebugInfo(
-    "enable-trap-debug-info", llvm::cl::Hidden,
+    "enable-trap-debug-info", llvm::cl::init(true), llvm::cl::Hidden,
     llvm::cl::desc("Generate failure-message functions in the debug info"));
 
 IRGenFunction::IRGenFunction(IRGenModule &IGM, llvm::Function *Fn,
diff --git a/test/DebugInfo/linetable-codeview.swift b/test/DebugInfo/linetable-codeview.swift
index 37b878030d159..a47c5a977ddbb 100644
--- a/test/DebugInfo/linetable-codeview.swift
+++ b/test/DebugInfo/linetable-codeview.swift
@@ -1,4 +1,4 @@
-// RUN: %swiftc_driver %s -g -debug-info-format=codeview -Xllvm -enable-trap-debug-info -emit-ir -o - | %FileCheck %s
+// RUN: %swiftc_driver %s -g -debug-info-format=codeview -emit-ir -o - | %FileCheck %s
 // REQUIRES: optimized_stdlib
 
 func markUsed<T>(_ t: T) {}
diff --git a/test/IRGen/condfail_message.swift b/test/IRGen/condfail_message.swift
index d0a9c975e721b..7638aebaab18a 100644
--- a/test/IRGen/condfail_message.swift
+++ b/test/IRGen/condfail_message.swift
@@ -1,5 +1,5 @@
-// RUN: %target-swift-frontend -primary-file %s -g -Xllvm -enable-trap-debug-info -emit-ir | %FileCheck %s
-// RUN: %target-swift-frontend -primary-file %s -g -Xllvm -enable-trap-debug-info -O -emit-ir | %FileCheck %s
+// RUN: %target-swift-frontend -primary-file %s -g -emit-ir | %FileCheck %s
+// RUN: %target-swift-frontend -primary-file %s -g -O -emit-ir | %FileCheck %s
 // REQUIRES: optimized_stdlib
 
 // CHECK-LABEL: define hidden swiftcc i8 @"$s16condfail_message6testitys4Int8VADF"(i8 %0)