Rename JVM_GetClassName #4836
Rename JVM_GetClassName #4836
Conversation
keithc-ca
commented
Feb 22, 2019
keithc-ca
commented
- name changed to JVM_InitClassName for Java 11 and Java 13+
| @@ -75,7 +75,10 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti | |||
| <export name="_JVM_GetClassConstantPool@8" /> | |||
| <export name="_JVM_GetClassContext@4" /> | |||
| <export name="_JVM_GetClassLoader@8" /> | |||
| <export name="_JVM_GetClassName@8" /> | |||
| <export name="_JVM_GetClassName@8"> | |||
| <include-if condition="spec.java12 or not spec.java11"/> | |||
There was a problem hiding this comment.
It would be clearer to use spec.java8 or spec.java12.
Won't this do the wrong thing for java14?
There was a problem hiding this comment.
No, spec.java12 implies JAVA_SPEC_VERSION >= 12.
| @@ -329,6 +332,9 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti | |||
| <export name="JVM_GetNestHost"/> | |||
| <export name="JVM_GetNestMembers"/> | |||
| <export name="JVM_AreNestMates"/> | |||
| <export name="JVM_InitClassName"> | |||
| <exclude-if condition="spec.java12 and not spec.java13"/> | |||
There was a problem hiding this comment.
This doesn't seem right, it should be excluded for java8 and java12
There was a problem hiding this comment.
This group, jdk11, is only used for Java 11+ (which excludes it for Java 8).
See my comment above: The condition excludes the export for Java 12+, but not Java 13+ (which means only for Java 12).
| #if (JAVA_SPEC_VERSION < 11) || (JAVA_SPEC_VERSION == 12) | ||
| JVM_GetClassName | ||
| #else /* (JAVA_SPEC_VERSION < 11) || (JAVA_SPEC_VERSION == 12) */ | ||
| JVM_InitClassName |
There was a problem hiding this comment.
How do we know the implementation for JVM_InitClassName is the same as for JVM_GetClassName?
There was a problem hiding this comment.
Class.java seems to use the methods the same way: I think openjdk just changed the name not its behavior. I take that back: the new version is expected to initialize the name field. I'll fix that.
There was a problem hiding this comment.
Note that since this isn't used, a stub that asserts would be fine.
* name changed to JVM_InitClassName for Java 11 and Java 13+ * JVM_InitClassName caches the result in the 'name' field Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
|
Updated |
|
jenkins test sanity win,plinux jdk8,jdk11,jdk12 |
