diff --git a/gcc/mode-switching.c b/gcc/mode-switching.c
index d607ad3122d848facb798ca2f6ffc1646b4ee930..ab51ae07397c6d11935ee1050ef1073e5202b5e4 100644
--- a/gcc/mode-switching.c
+++ b/gcc/mode-switching.c
@@ -242,8 +242,7 @@ create_pre_exit (int n_entities, int *entity_map, const int *num_modes)
 		int copy_start, copy_num;
 		int j;
 
-		if (INSN_P (return_copy)
-		    && !DEBUG_INSN_P (return_copy))
+		if (NONDEBUG_INSN_P (return_copy))
 		  {
 		    /* When using SJLJ exceptions, the call to the
 		       unregister function is inserted between the