hg: panama/dev: manual merge with default

sandhya.viswanathan at intel.com sandhya.viswanathan at intel.com
Mon Mar 30 23:22:32 UTC 2020


Changeset: b16ebf6fd071
Author:    sviswanathan
Date:      2020-03-30 16:21 -0700
URL:       https://hg.openjdk.java.net/panama/dev/rev/b16ebf6fd071

manual merge with default

! src/hotspot/cpu/aarch64/aarch64.ad
! src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
! src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
! src/hotspot/cpu/arm/arm.ad
! src/hotspot/cpu/ppc/ppc.ad
! src/hotspot/cpu/s390/s390.ad
! src/hotspot/cpu/sparc/sparc.ad
! src/hotspot/cpu/x86/assembler_x86.cpp
! src/hotspot/cpu/x86/assembler_x86.hpp
+ src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+ src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.hpp
! src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
! src/hotspot/cpu/x86/vm_version_x86.cpp
! src/hotspot/cpu/x86/vm_version_x86.hpp
! src/hotspot/cpu/x86/x86.ad
! src/hotspot/share/classfile/modules.cpp
! src/hotspot/share/opto/cfgnode.cpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/compile.hpp
! src/hotspot/share/opto/node.hpp
! src/hotspot/share/opto/type.cpp
! src/hotspot/share/opto/type.hpp
! src/java.base/share/classes/java/lang/Class.java
! src/java.base/share/classes/jdk/internal/misc/Unsafe.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BasePropertyTaglet.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/PropertyGetterTaglet.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/PropertySetterTaglet.java



More information about the panama-dev mailing list