--- old/src/java.base/share/native/libjava/ConstantPool.c	2018-09-28 11:54:33.000000000 -0700
+++ new/src/java.base/share/native/libjava/ConstantPool.c	2018-09-28 11:54:32.000000000 -0700
@@ -26,111 +26,78 @@
 #include "jvm.h"
 #include "jdk_internal_reflect_ConstantPool.h"
 
-JNIEXPORT jint JNICALL Java_jdk_internal_reflect_ConstantPool_getSize0
-(JNIEnv *env, jobject unused, jobject jcpool)
+JNIEXPORT jclass JNICALL Java_jdk_internal_reflect_ConstantPool_getHolder1
+(JNIEnv *env, jobject jcpool)
 {
-  return JVM_ConstantPoolGetSize(env, unused, jcpool);
+  return JVM_ConstantPool1GetHolder(env, jcpool);
 }
 
-JNIEXPORT jclass JNICALL Java_jdk_internal_reflect_ConstantPool_getClassAt0
-(JNIEnv *env, jobject unused, jobject jcpool, jint index)
+JNIEXPORT jint JNICALL Java_jdk_internal_reflect_ConstantPool_getSize1
+(JNIEnv *env, jobject jcpool)
 {
-  return JVM_ConstantPoolGetClassAt(env, unused, jcpool, index);
+  return JVM_ConstantPool1GetSize(env, jcpool);
 }
 
-JNIEXPORT jclass JNICALL Java_jdk_internal_reflect_ConstantPool_getClassAtIfLoaded0
-(JNIEnv *env, jobject unused, jobject jcpool, jint index)
+JNIEXPORT jint JNICALL Java_jdk_internal_reflect_ConstantPool_getWordCountAt1
+(JNIEnv *env, jobject jcpool, jint index)
 {
-  return JVM_ConstantPoolGetClassAtIfLoaded(env, unused, jcpool, index);
+    return JVM_ConstantPool1GetWordCountAt(env, jcpool, index);
 }
 
-JNIEXPORT jint JNICALL Java_jdk_internal_reflect_ConstantPool_getClassRefIndexAt0
-(JNIEnv *env, jobject unused, jobject jcpool, jint index)
+JNIEXPORT jint JNICALL Java_jdk_internal_reflect_ConstantPool_getWordAt1
+(JNIEnv *env, jobject jcpool, jint index, jint word)
 {
-    return JVM_ConstantPoolGetClassRefIndexAt(env, unused, jcpool, index);
+    return JVM_ConstantPool1GetWordAt(env, jcpool, index, word);
 }
 
-JNIEXPORT jobject JNICALL Java_jdk_internal_reflect_ConstantPool_getMethodAt0
-(JNIEnv *env, jobject unused, jobject jcpool, jint index)
+JNIEXPORT jobject JNICALL Java_jdk_internal_reflect_ConstantPool_getRefAt1
+(JNIEnv *env, jobject jcpool, jint index, jint word, jbyte resolving, jobject if_not_present)
 {
-  return JVM_ConstantPoolGetMethodAt(env, unused, jcpool, index);
+  return JVM_ConstantPool1GetRefAt(env, jcpool, index, word, resolving, if_not_present);
 }
 
-JNIEXPORT jobject JNICALL Java_jdk_internal_reflect_ConstantPool_getMethodAtIfLoaded0
-(JNIEnv *env, jobject unused, jobject jcpool, jint index)
+JNIEXPORT void JNICALL Java_jdk_internal_reflect_ConstantPool_copyOutRefsAt1
+(JNIEnv *env, jobject jcpool, jint index, jint start_word, jint end_word,
+ jobject buf, jint buf_pos, jbyte resolving,
+ jobject if_not_present, jobject if_null_constant, jboolean skip_non_null)
 {
-  return JVM_ConstantPoolGetMethodAtIfLoaded(env, unused, jcpool, index);
+  JVM_ConstantPool1CopyOutRefsAt(env, jcpool, index, start_word, end_word,
+                                 buf, buf_pos, resolving, if_not_present, if_null_constant, skip_non_null);
 }
 
-JNIEXPORT jobject JNICALL Java_jdk_internal_reflect_ConstantPool_getFieldAt0
-(JNIEnv *env, jobject unused, jobject jcpool, jint index)
+JNIEXPORT jint JNICALL Java_jdk_internal_reflect_ConstantPool_getIntAt1
+(JNIEnv *env, jobject jcpool, jint index)
 {
-  return JVM_ConstantPoolGetFieldAt(env, unused, jcpool, index);
+  return JVM_ConstantPool1GetIntAt(env, jcpool, index);
 }
 
-JNIEXPORT jobject JNICALL Java_jdk_internal_reflect_ConstantPool_getFieldAtIfLoaded0
-(JNIEnv *env, jobject unused, jobject jcpool, jint index)
+JNIEXPORT jlong JNICALL Java_jdk_internal_reflect_ConstantPool_getLongAt1
+(JNIEnv *env, jobject jcpool, jint index)
 {
-  return JVM_ConstantPoolGetFieldAtIfLoaded(env, unused, jcpool, index);
+  return JVM_ConstantPool1GetLongAt(env, jcpool, index);
 }
 
-JNIEXPORT jobjectArray JNICALL Java_jdk_internal_reflect_ConstantPool_getMemberRefInfoAt0
-(JNIEnv *env, jobject unused, jobject jcpool, jint index)
+JNIEXPORT jfloat JNICALL Java_jdk_internal_reflect_ConstantPool_getFloatAt1
+(JNIEnv *env, jobject jcpool, jint index)
 {
-  return JVM_ConstantPoolGetMemberRefInfoAt(env, unused, jcpool, index);
+  return JVM_ConstantPool1GetFloatAt(env, jcpool, index);
 }
 
-JNIEXPORT jint JNICALL Java_jdk_internal_reflect_ConstantPool_getNameAndTypeRefIndexAt0
-(JNIEnv *env, jobject unused, jobject jcpool, jint index)
+JNIEXPORT jdouble JNICALL Java_jdk_internal_reflect_ConstantPool_getDoubleAt1
+(JNIEnv *env, jobject jcpool, jint index)
 {
-    return JVM_ConstantPoolGetNameAndTypeRefIndexAt(env, unused, jcpool, index);
+  return JVM_ConstantPool1GetDoubleAt(env, jcpool, index);
 }
 
-JNIEXPORT jobjectArray JNICALL Java_jdk_internal_reflect_ConstantPool_getNameAndTypeRefInfoAt0
-(JNIEnv *env, jobject unused, jobject jcpool, jint index)
+JNIEXPORT jbyte JNICALL Java_jdk_internal_reflect_ConstantPool_getTagAt1
+(JNIEnv *env, jobject jcpool, jint index)
 {
-  return JVM_ConstantPoolGetNameAndTypeRefInfoAt(env, unused, jcpool, index);
+  return JVM_ConstantPool1GetTagAt(env, jcpool, index);
 }
 
-JNIEXPORT jint JNICALL Java_jdk_internal_reflect_ConstantPool_getIntAt0
-(JNIEnv *env, jobject unused, jobject jcpool, jint index)
+JNIEXPORT jbyteArray JNICALL Java_jdk_internal_reflect_ConstantPool_getTags1
+(JNIEnv *env, jobject jcpool)
 {
-  return JVM_ConstantPoolGetIntAt(env, unused, jcpool, index);
-}
-
-JNIEXPORT jlong JNICALL Java_jdk_internal_reflect_ConstantPool_getLongAt0
-(JNIEnv *env, jobject unused, jobject jcpool, jint index)
-{
-  return JVM_ConstantPoolGetLongAt(env, unused, jcpool, index);
-}
-
-JNIEXPORT jfloat JNICALL Java_jdk_internal_reflect_ConstantPool_getFloatAt0
-(JNIEnv *env, jobject unused, jobject jcpool, jint index)
-{
-  return JVM_ConstantPoolGetFloatAt(env, unused, jcpool, index);
-}
-
-JNIEXPORT jdouble JNICALL Java_jdk_internal_reflect_ConstantPool_getDoubleAt0
-(JNIEnv *env, jobject unused, jobject jcpool, jint index)
-{
-  return JVM_ConstantPoolGetDoubleAt(env, unused, jcpool, index);
-}
-
-JNIEXPORT jstring JNICALL Java_jdk_internal_reflect_ConstantPool_getStringAt0
-(JNIEnv *env, jobject unused, jobject jcpool, jint index)
-{
-  return JVM_ConstantPoolGetStringAt(env, unused, jcpool, index);
-}
-
-JNIEXPORT jstring JNICALL Java_jdk_internal_reflect_ConstantPool_getUTF8At0
-(JNIEnv *env, jobject unused, jobject jcpool, jint index)
-{
-  return JVM_ConstantPoolGetUTF8At(env, unused, jcpool, index);
-}
-
-JNIEXPORT jbyte JNICALL Java_jdk_internal_reflect_ConstantPool_getTagAt0
-(JNIEnv *env, jobject unused, jobject jcpool, jint index)
-{
-  return JVM_ConstantPoolGetTagAt(env, unused, jcpool, index);
+  return JVM_ConstantPool1GetTags(env, jcpool);
 }