--- old/src/share/vm/classfile/vmSymbols.hpp	2017-03-15 16:57:51.427846613 -0400
+++ new/src/share/vm/classfile/vmSymbols.hpp	2017-03-15 16:57:50.047766816 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -402,6 +402,7 @@
   template(hash_name,                                 "hash")                                     \
   template(coder_name,                                "coder")                                    \
   template(compact_strings_name,                      "COMPACT_STRINGS")                          \
+  template(debug_intrinsics_name,                     "DEBUG_INTRINSICS")                         \
   template(numberOfLeadingZeros_name,                 "numberOfLeadingZeros")                     \
   template(numberOfTrailingZeros_name,                "numberOfTrailingZeros")                    \
   template(bitCount_name,                             "bitCount")                                 \
@@ -917,9 +918,9 @@
   do_intrinsic(_getCharsStringU,          java_lang_StringUTF16, getCharsU_name, getCharsU_signature,            F_S)   \
    do_name(     getCharsU_name,                                  "getChars")                                            \
    do_signature(getCharsU_signature,                             "([BII[CI)V")                                          \
-  do_intrinsic(_getCharStringU,           java_lang_StringUTF16, getChar_name, getCharStringU_signature,         F_S)   \
+  do_intrinsic(_getCharStringU,           java_lang_StringUTF16, getCharUnsafe_name, getCharStringU_signature,   F_S)   \
    do_signature(getCharStringU_signature,                        "([BI)C")                                              \
-  do_intrinsic(_putCharStringU,           java_lang_StringUTF16, putChar_name, putCharStringU_signature,         F_S)   \
+  do_intrinsic(_putCharStringU,           java_lang_StringUTF16, putCharUnsafe_name, putCharStringU_signature,   F_S)   \
    do_signature(putCharStringU_signature,                        "([BII)V")                                             \
   do_intrinsic(_compareToL,               java_lang_StringLatin1,compareTo_name, compareTo_indexOf_signature,    F_S)   \
   do_intrinsic(_compareToU,               java_lang_StringUTF16, compareTo_name, compareTo_indexOf_signature,    F_S)   \
@@ -1120,6 +1121,7 @@
   do_name(getLong_name,"getLong")               do_name(putLong_name,"putLong")                                         \
   do_name(getFloat_name,"getFloat")             do_name(putFloat_name,"putFloat")                                       \
   do_name(getDouble_name,"getDouble")           do_name(putDouble_name,"putDouble")                                     \
+  do_name(getCharUnsafe_name,"getCharUnsafe")   do_name(putCharUnsafe_name,"putCharUnsafe")                             \
                                                                                                                         \
   do_intrinsic(_getObject,          jdk_internal_misc_Unsafe,     getObject_name, getObject_signature,           F_RN)  \
   do_intrinsic(_getBoolean,         jdk_internal_misc_Unsafe,     getBoolean_name, getBoolean_signature,         F_RN)  \