diff --git a/src/mono/mono/mini/interp/transform.c b/src/mono/mono/mini/interp/transform.c
index 074290bb7bfe8a..0e71341d852f50 100644
--- a/src/mono/mono/mini/interp/transform.c
+++ b/src/mono/mono/mini/interp/transform.c
@@ -7544,8 +7544,10 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
g_error ("transform.c: Unimplemented opcode: 0xFE %02x (%s) at 0x%x\n", *td->ip, mono_opcode_name (256 + *td->ip), td->ip-header->code);
}
break;
- default:
- g_error ("transform.c: Unimplemented opcode: %02x at 0x%x\n", *td->ip, td->ip-header->code);
+ default: {
+ mono_error_set_generic_error (error, "System", "InvalidProgramException", "opcode 0x%02x not handled", *td->ip);
+ goto exit;
+ }
}
// No IR instructions were added as part of a bb_start IL instruction. Add a MINT_NOP
// so we always have an instruction associated with a bb_start. This is simple and avoids
diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index f5500a2b1cb009..c7405591def058 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -1607,9 +1607,6 @@
https://github.com/dotnet/runtime/issues/54381
-
- https://github.com/dotnet/runtime/issues/54372
-
https://github.com/dotnet/runtime/issues/54381
@@ -1622,9 +1619,6 @@
needs triage
-
- https://github.com/dotnet/runtime/issues/54372
-
needs triage
@@ -1643,9 +1637,6 @@
https://github.com/dotnet/runtime/issues/54381
-
- https://github.com/dotnet/runtime/issues/54372
-
needs triage