--- a/src/hotspot/share/ci/ciObjArrayKlass.cpp	Mon Oct 21 09:26:14 2019 -0700
+++ b/src/hotspot/share/ci/ciObjArrayKlass.cpp	Mon Oct 21 13:13:16 2019 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, 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
@@ -112,16 +112,16 @@
   Symbol* base_name_sym = element_name->get_symbol();
   char* name;
 
-  if (base_name_sym->char_at(0) == '[' ||
-      (base_name_sym->char_at(0) == 'L' &&  // watch package name 'Lxx'
-       base_name_sym->char_at(element_len-1) == ';')) {
+  if (base_name_sym->char_at(0) == JVM_SIGNATURE_ARRAY ||
+      (base_name_sym->char_at(0) == JVM_SIGNATURE_CLASS &&  // watch package name 'Lxx'
+       base_name_sym->char_at(element_len-1) == JVM_SIGNATURE_ENDCLASS)) {
 
     int new_len = element_len + dimension + 1; // for the ['s and '\0'
     name = CURRENT_THREAD_ENV->name_buffer(new_len);
 
     int pos = 0;
     for ( ; pos < dimension; pos++) {
-      name[pos] = '[';
+      name[pos] = JVM_SIGNATURE_ARRAY;
     }
     strncpy(name+pos, (char*)element_name->base(), element_len);
     name[new_len-1] = '\0';
@@ -133,11 +133,11 @@
     name = CURRENT_THREAD_ENV->name_buffer(new_len);
     int pos = 0;
     for ( ; pos < dimension; pos++) {
-      name[pos] = '[';
+      name[pos] = JVM_SIGNATURE_ARRAY;
     }
-    name[pos++] = 'L';
+    name[pos++] = JVM_SIGNATURE_CLASS;
     strncpy(name+pos, (char*)element_name->base(), element_len);
-    name[new_len-2] = ';';
+    name[new_len-2] = JVM_SIGNATURE_ENDCLASS;
     name[new_len-1] = '\0';
   }
   return ciSymbol::make(name);