Index: lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
===================================================================
--- lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
+++ lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
@@ -59,6 +59,7 @@
   initializeSIInsertWaitsPass(*PR);
   initializeSIWholeQuadModePass(*PR);
   initializeSILowerControlFlowPass(*PR);
+  initializeSIDebuggerInsertNopsPass(*PR);
 }
 
 static std::unique_ptr<TargetLoweringObjectFile> createTLOF(const Triple &TT) {
Index: lib/Target/AMDGPU/SIDebuggerInsertNops.cpp
===================================================================
--- lib/Target/AMDGPU/SIDebuggerInsertNops.cpp
+++ lib/Target/AMDGPU/SIDebuggerInsertNops.cpp
@@ -39,6 +39,11 @@
   SIDebuggerInsertNops() : MachineFunctionPass(ID) { }
   const char *getPassName() const override { return PASS_NAME; }
 
+  void getAnalysisUsage(AnalysisUsage &AU) const override {
+    AU.setPreservesCFG();
+    MachineFunctionPass::getAnalysisUsage(AU);
+  }
+
   bool runOnMachineFunction(MachineFunction &MF) override;
 };