Mercurial > hg > openjdk > jdk9 > hotspot
changeset 10928:15f3fe264872 jdk-9+119
Merge
author | lana |
---|---|
date | Thu, 12 May 2016 18:46:40 +0000 |
parents | e3ca323dfe1b (current diff) a389eb33db44 (diff) |
children | 7eab471aeaf0 1691ffd6dab4 |
files | |
diffstat | 2 files changed, 24 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/prims/jvm.cpp Thu May 12 15:15:02 2016 +0000 +++ b/src/share/vm/prims/jvm.cpp Thu May 12 18:46:40 2016 +0000 @@ -3387,14 +3387,14 @@ return (!access.is_private() && InstanceKlass::cast(current_class)->is_same_class_package(field_class)); } -// Return the first non-null class loader up the execution stack, or null -// if only code from the null class loader is on the stack. +// Return the first user-defined class loader up the execution stack, or null +// if only code from the bootstrap or platform class loader is on the stack. JVM_ENTRY(jobject, JVM_LatestUserDefinedLoader(JNIEnv *env)) for (vframeStream vfst(thread); !vfst.at_end(); vfst.next()) { vfst.skip_reflection_related_frames(); // Only needed for 1.4 reflection oop loader = vfst.method()->method_holder()->class_loader(); - if (loader != NULL) { + if (loader != NULL && !SystemDictionary::is_platform_class_loader(loader)) { return JNIHandles::make_local(env, loader); } }
--- a/test/Makefile Thu May 12 15:15:02 2016 +0000 +++ b/test/Makefile Thu May 12 18:46:40 2016 +0000 @@ -120,24 +120,33 @@ TEST_ROOT := $(shell pwd) # Root of all test results -ifdef ALT_OUTPUTDIR - ABS_BUILD_ROOT = $(ALT_OUTPUTDIR) +ifdef TEST_OUTPUT_DIR + $(shell $(MKDIR) -p $(TEST_OUTPUT_DIR)/jtreg) + ABS_TEST_OUTPUT_DIR := \ + $(shell $(CD) $(TEST_OUTPUT_DIR)/jtreg && $(PWD)) else - ABS_BUILD_ROOT = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH) + ifdef ALT_OUTPUTDIR + ABS_OUTPUTDIR = $(shell $(CD) $(ALT_OUTPUTDIR) && $(PWD)) + else + ABS_OUTPUTDIR = $(shell $(CD) $(TEST_ROOT)/.. && $(PWD)) + endif + + ABS_PLATFORM_BUILD_ROOT = $(ABS_OUTPUTDIR) + ABS_TEST_OUTPUT_DIR := $(ABS_PLATFORM_BUILD_ROOT)/testoutput/$(UNIQUE_DIR) endif -ABS_TEST_OUTPUT_DIR = $(ABS_BUILD_ROOT)/testoutput/$(UNIQUE_DIR) # Expect JPRT to set PRODUCT_HOME (the product or jdk in this case to test) ifndef PRODUCT_HOME - # Try to use j2sdk-image if it exists - ABS_JDK_IMAGE = $(ABS_BUILD_ROOT)/j2sdk-image - PRODUCT_HOME := \ - $(shell \ - if [ -d $(ABS_JDK_IMAGE) ] ; then \ - $(ECHO) "$(ABS_JDK_IMAGE)"; \ - else \ - $(ECHO) "$(ABS_BUILD_ROOT)" ; \ + # Try to use images/jdk if it exists + ABS_JDK_IMAGE = $(ABS_PLATFORM_BUILD_ROOT)/images/jdk + PRODUCT_HOME := \ + $(shell \ + if [ -d $(ABS_JDK_IMAGE) ] ; then \ + $(ECHO) "$(ABS_JDK_IMAGE)"; \ + else \ + $(ECHO) "$(ABS_PLATFORM_BUILD_ROOT)"; \ fi) + PRODUCT_HOME := $(PRODUCT_HOME) endif # Expect JPRT to set JAVA_ARGS (e.g. -server etc.)