diff --git a/llvm/lib/Target/Hexagon/HexagonPatterns.td b/llvm/lib/Target/Hexagon/HexagonPatterns.td
index 3f836e8c1dbef..0c9650585b613 100644
--- a/llvm/lib/Target/Hexagon/HexagonPatterns.td
+++ b/llvm/lib/Target/Hexagon/HexagonPatterns.td
@@ -3461,7 +3461,7 @@ def HexagonBARRIER: SDNode<"HexagonISD::BARRIER", SDTNone, [SDNPHasChain]>;
 def: Pat<(HexagonBARRIER), (Y2_barrier)>;
 
 def: Pat<(trap), (PS_crash)>;
-def: Pat<(debugtrap), (Y2_break)>;
+def: Pat<(debugtrap), (J2_trap0 0xDB)>;
 
 // Read cycle counter.
 def : Pat<(i64 (readcyclecounter)), (PS_readcr64 UPCYCLE)>;
diff --git a/llvm/test/CodeGen/Hexagon/trap-crash.ll b/llvm/test/CodeGen/Hexagon/trap-crash.ll
index c19f90c297abb..7ff3db1e75c40 100644
--- a/llvm/test/CodeGen/Hexagon/trap-crash.ll
+++ b/llvm/test/CodeGen/Hexagon/trap-crash.ll
@@ -14,7 +14,7 @@ entry:
 }
 
 ; CHECK-LABEL: f1
-; CHECK: brkpt
+; CHECK: trap0(#219)
 define i32 @f1() noreturn nounwind {
 entry:
   tail call void @llvm.debugtrap()