stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Alejandro Murillo 2016-03-08 19:03:30 -08:00
commit 5e3abca606
4 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/bin/compare_exceptions.sh.incl
View File

@ -185,7 +185,6 @@ if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "x86_64" ];
./lib/amd64/libjava.so
./lib/amd64/libjawt.so
./lib/amd64/libjdwp.so
./lib/amd64/libjfr.so
./lib/amd64/libjpeg.so
./lib/amd64/libjsdt.so
./lib/amd64/libjsound.so
@ -321,7 +320,6 @@ if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "sparcv9" ]
./lib/sparcv9/libjava.so
./lib/sparcv9/libjawt.so
./lib/sparcv9/libjdwp.so
./lib/sparcv9/libjfr.so
./lib/sparcv9/libjpeg.so
./lib/sparcv9/libjsdt.so
./lib/sparcv9/libjsound.so

16
make/CompileJavaModules.gmk
View File

@ -368,21 +368,7 @@ jdk.compiler_CLEAN_FILES := $(wildcard \
################################################################################
jdk.hotspot.agent_ADD_JAVAC_FLAGS := $(DISABLE_WARNINGS),-overrides
jdk.hotspot.agent_COPY := .png sa.js .properties
ifeq ($(MODULE), jdk.hotspot.agent)
### Copy gif files
# Special handling to copy gif files in images/toolbarButtonGraphics \
# -> classes/toolbarButtonGraphics.
# These can't be handled by COPY to SetupJavaCompilation since they chop off
# one directory level.
$(eval $(call SetupCopyFiles, COPY_SA_IMAGES, \
SRC := $(HOTSPOT_TOPDIR)/src/jdk.hotspot.agent/share/classes/images, \
DEST := $(JDK_OUTPUTDIR)/modules/$(MODULE), \
FILES := $(wildcard $(HOTSPOT_TOPDIR)/src/jdk.hotspot.agent/share/classes/images/*/*/*.gif), \
))
jdk.hotspot.agent: $(COPY_SA_IMAGES)
endif
jdk.hotspot.agent_COPY := .gif .png sa.js .properties
################################################################################

19
modules.xml
View File

@ -239,6 +239,7 @@
<to>java.xml</to>
<to>jdk.charsets</to>
<to>jdk.management.resource</to>
<to>jdk.jfr</to>
<to>jdk.net</to>
<to>jdk.scripting.nashorn</to>
<to>jdk.vm.ci</to>
@ -249,6 +250,22 @@
<to>java.management</to>
<to>jdk.jvmstat</to>
</export>
<export>
<name>jdk.internal.org.xml.sax</name>
<to>jdk.jfr</to>
</export>
<export>
<name>jdk.internal.org.xml.sax.helpers</name>
<to>jdk.jfr</to>
</export>
<export>
<name>jdk.internal.util.xml</name>
<to>jdk.jfr</to>
</export>
<export>
<name>jdk.internal.util.xml.impl</name>
<to>jdk.jfr</to>
</export>
<export>
<name>jdk.internal.org.objectweb.asm</name>
<to>java.instrument</to>
@ -313,6 +330,7 @@
<to>jdk.vm.ci</to>
<to>jdk.zipfs</to>
<to>java.instrument</to>
<to>jdk.jfr</to>
</export>
<export>
<name>sun.net</name>
@ -922,6 +940,7 @@
<name>sun.management.spi</name>
<to>jdk.management</to>
<to>jdk.management.cmm</to>
<to>jdk.management.jfr</to>
</export>
</module>
<module>

24
test/lib/sun/hotspot/WhiteBox.java
View File

@ -119,6 +119,28 @@ public class WhiteBox {
return getConstantPool0(aClass);
}
private native int getConstantPoolCacheIndexTag0();
public int getConstantPoolCacheIndexTag() {
return getConstantPoolCacheIndexTag0();
}
private native int getConstantPoolCacheLength0(Class<?> aClass);
public int getConstantPoolCacheLength(Class<?> aClass) {
Objects.requireNonNull(aClass);
return getConstantPoolCacheLength0(aClass);
}
private native int remapInstructionOperandFromCPCache0(Class<?> aClass, int index);
public int remapInstructionOperandFromCPCache(Class<?> aClass, int index) {
Objects.requireNonNull(aClass);
return remapInstructionOperandFromCPCache0(aClass, index);
}
private native int encodeConstantPoolIndyIndex0(int index);
public int encodeConstantPoolIndyIndex(int index) {
return encodeConstantPoolIndyIndex0(index);
}
// JVMTI
private native void addToBootstrapClassLoaderSearch0(String segment);
public void addToBootstrapClassLoaderSearch(String segment){
@ -185,7 +207,7 @@ public class WhiteBox {
// Compiler
public native int matchesMethod(Executable method, String pattern);
public native int matchesInline(Executable method, String pattern);
public native boolean shouldPrintAssembly(Executable method);
public native boolean shouldPrintAssembly(Executable method, int comp_level);
public native int deoptimizeFrames(boolean makeNotEntrant);
public native void deoptimizeAll();