--- old/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp	2019-09-02 10:59:20.284761268 +0000
+++ new/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp	2019-09-02 10:59:19.028704862 +0000
@@ -1219,9 +1219,8 @@
       break;
 
     default:
-      // DMS CHECK: This code should be fixed in JDK workspace, because it fails 
-      // with assert during vm intialization rather than insert a call 
-      // to unimplemented_entry
+      // FIXME: For unhandled trap_id this code fails with assert during vm intialization 
+      // rather than insert a call to unimplemented_entry
       { StubFrame f(sasm, "unimplemented entry", dont_gc_arguments);
         __ mov(r0, (int)id);
         __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), r0);