OpenJDK / amber / amber
changeset 49664:273c535ba7cc
Merge
| author | prr |
|---|---|
| date | Mon, 12 Mar 2018 10:53:22 -0700 |
| parents | 81cd35f71563 e991d0be4cc9 |
| children | 3375a8039fde |
| files | |
| diffstat | 3 files changed, 12 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/MakeBase.gmk Mon Mar 12 09:37:49 2018 -0700 +++ b/make/common/MakeBase.gmk Mon Mar 12 10:53:22 2018 -0700 @@ -518,12 +518,14 @@ define install-file $(call MakeTargetDir) $(RM) '$(call DecodeSpace, $@)' - if [ '$(call DecodeSpace, $(dir $@))' != \ + if [ '$(call DecodeSpace, $(dir $(call EncodeSpace, $@)))' != \ '$(call DecodeSpace, $(dir $(call EncodeSpace, $<)))' ]; then \ - $(CP) -f -r -P '$(call DecodeSpace, $<)' '$(call DecodeSpace, $(@D))'; \ - if [ '$(call DecodeSpace, $(@F))' != \ + $(CP) -f -r -P '$(call DecodeSpace, $<)' \ + '$(call DecodeSpace, $(dir $(call EncodeSpace, $@)))'; \ + if [ '$(call DecodeSpace, $(notdir $(call EncodeSpace, $@)))' != \ '$(call DecodeSpace, $(notdir $(call EncodeSpace, $(<))))' ]; then \ - $(MV) '$(call DecodeSpace, $(@D)/$(<F))' '$(call DecodeSpace, $@)'; \ + $(MV) '$(call DecodeSpace, $(dir $(call EncodeSpace, $@))/$(notdir $(call EncodeSpace, $<)))' \ + '$(call DecodeSpace, $@)'; \ fi; \ else \ if [ -L '$(call DecodeSpace, $<)' ]; then \
--- a/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java Mon Mar 12 09:37:49 2018 -0700 +++ b/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java Mon Mar 12 10:53:22 2018 -0700 @@ -669,6 +669,7 @@ case PUT_LONG: // fall-through case PUT_FLOAT: // fall-through case PUT_DOUBLE: // fall-through + case DIRECT_NEW_INVOKE_SPECIAL: // fall-through case DIRECT_INVOKE_INTERFACE: // fall-through case DIRECT_INVOKE_SPECIAL: // fall-through case DIRECT_INVOKE_STATIC: // fall-through @@ -1864,13 +1865,11 @@ * Emit a bogus method that just loads some string constants. This is to get the constants into the constant pool * for debugging purposes. */ - private void bogusMethod(Object... os) { + private void bogusMethod(Object os) { if (DUMP_CLASS_FILES) { mv = cw.visitMethod(Opcodes.ACC_STATIC, "dummy", "()V", null, null); - for (Object o : os) { - mv.visitLdcInsn(o.toString()); - mv.visitInsn(Opcodes.POP); - } + mv.visitLdcInsn(os.toString()); + mv.visitInsn(Opcodes.POP); mv.visitInsn(Opcodes.RETURN); mv.visitMaxs(0, 0); mv.visitEnd();
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java Mon Mar 12 09:37:49 2018 -0700 +++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java Mon Mar 12 10:53:22 2018 -0700 @@ -147,7 +147,8 @@ "L_I", "L_L", "L_V", "LD_L", "LF_L", "LI_I", "LII_L", "LLI_L", "LL_V", "LL_L", "L3_L", "L4_L", "L5_L", "L6_L", "L7_L", "L8_L", "L9_L", "L10_L", "L10I_L", "L10II_L", "L10IIL_L", - "L11_L", "L12_L", "L13_L", "L14_L", "L14I_L", "L14II_L") + "L11_L", "L12_L", "L13_L", "L14_L", "L14I_L", "L14II_L"), + DMH_NEW_INVOKE_SPECIAL, Set.of("L_L", "LL_L") ); }