--- old/src/jdk.jdwp.agent/share/native/libjdwp/ObjectReferenceImpl.c	2020-01-10 19:17:54.425466261 +0000
+++ new/src/jdk.jdwp.agent/share/native/libjdwp/ObjectReferenceImpl.c	2020-01-10 19:17:53.730451638 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -352,15 +352,18 @@
     return JNI_TRUE;
 }
 
-void *ObjectReference_Cmds[] = { (void *)10
-    ,(void *)referenceType
-    ,(void *)getValues
-    ,(void *)setValues
-    ,(void *)NULL      /* no longer used */
-    ,(void *)monitorInfo
-    ,(void *)invokeInstance
-    ,(void *)disableCollection
-    ,(void *)enableCollection
-    ,(void *)isCollected
-    ,(void *)referringObjects
-    };
+CommandSet ObjectReference_Cmds = {
+    10, "ObjectReference",
+    {
+        {referenceType, "ReferenceType"},
+        {getValues, "GetValues"},
+        {setValues, "SetValues"},
+        {NULL, "<unused>"},
+        {monitorInfo, "MonitorInfo"},
+        {invokeInstance, "InvokeInstance"},
+        {disableCollection, "DisableCollection"},
+        {enableCollection, "EnableCollection"},
+        {isCollected, "IsCollected"},
+        {referringObjects, "ReferringObjects"}
+    }
+};