Index: lldb/lit/Reproducer/Inputs/FileReplay.in
===================================================================
--- lldb/lit/Reproducer/Inputs/FileReplay.in
+++ /dev/null
@@ -1,2 +0,0 @@
-reproducer status
-run
Index: lldb/lit/Reproducer/Inputs/GDBRemoteReplay.in
===================================================================
--- lldb/lit/Reproducer/Inputs/GDBRemoteReplay.in
+++ /dev/null
@@ -1,5 +0,0 @@
-reproducer status
-breakpoint set -f simple.c -l 12
-run
-bt
-cont
Index: lldb/lit/Reproducer/TestFileRepro.test
===================================================================
--- lldb/lit/Reproducer/TestFileRepro.test
+++ lldb/lit/Reproducer/TestFileRepro.test
@@ -7,9 +7,9 @@
 # that the string "testing" is not printed.
 
 # RUN: %clang %S/Inputs/simple.c -g -o %t.out
-# RUN: %lldb -x -b -s %S/Inputs/FileCapture.in --capture %t.repro -- %t.out | FileCheck %s --check-prefix CHECK --check-prefix CAPTURE
+# RUN: %lldb -x -b -s %S/Inputs/FileCapture.in --capture %t.repro %t.out | FileCheck %s --check-prefix CHECK --check-prefix CAPTURE
 # RUN: rm %t.out
-# RUN: %lldb -x -b -s %S/Inputs/FileReplay.in --replay %t.repro -- %t.out | FileCheck %s --check-prefix CHECK --check-prefix REPLAY
+# RUN: %lldb --replay %t.repro | FileCheck %s --check-prefix CHECK --check-prefix REPLAY
 
 # CAPTURE: testing
 # REPLAY-NOT: testing
Index: lldb/lit/Reproducer/TestGDBRemoteRepro.test
===================================================================
--- lldb/lit/Reproducer/TestGDBRemoteRepro.test
+++ lldb/lit/Reproducer/TestGDBRemoteRepro.test
@@ -7,8 +7,8 @@
 # that the string "testing" is not printed.
 
 # RUN: %clang %S/Inputs/simple.c -g -o %t.out
-# RUN: %lldb -x -b -s %S/Inputs/GDBRemoteCapture.in --capture %t.repro -- %t.out | FileCheck %s --check-prefix CHECK --check-prefix CAPTURE
-# RUN: %lldb -x -b -s %S/Inputs/GDBRemoteReplay.in --replay %t.repro -- %t.out | FileCheck %s --check-prefix CHECK --check-prefix REPLAY
+# RUN: %lldb -x -b -s %S/Inputs/GDBRemoteCapture.in --capture %t.repro %t.out | FileCheck %s --check-prefix CHECK --check-prefix CAPTURE
+# RUN: %lldb --replay %t.repro | FileCheck %s --check-prefix CHECK --check-prefix REPLAY
 
 # CHECK: Breakpoint 1
 # CHECK: Process {{.*}} stopped
Index: lldb/source/API/SBReproducer.cpp
===================================================================
--- lldb/source/API/SBReproducer.cpp
+++ lldb/source/API/SBReproducer.cpp
@@ -2918,8 +2918,6 @@
     return error.c_str();
   }
 
-  // FIXME: Enable the following code once the SB reproducer has landed.
-#if 0
   FileSpec file = loader->GetFile<SBInfo>();
   if (!file) {
     error = "unable to get replay data from reproducer.";
@@ -2928,7 +2926,6 @@
 
   SBRegistry registry;
   registry.Replay(file);
-#endif
 
   return nullptr;
 }
Index: lldb/tools/driver/Driver.cpp
===================================================================
--- lldb/tools/driver/Driver.cpp
+++ lldb/tools/driver/Driver.cpp
@@ -905,7 +905,7 @@
       WithColor::error() << "reproducer replay failed: " << error << '\n';
       return 1;
     }
-    // FIXME: Return once SBReproducer::Replay actually performs the replay.
+    return 0;
   }
 
   SBError error = SBDebugger::InitializeWithErrorHandling();