From b22c47c39c2f28551086b59b1278b3a2369fe6d9 Mon Sep 17 00:00:00 2001 From: Zoltan Majo Date: Tue, 28 Jul 2015 19:20:33 +0200 Subject: [PATCH 1/2] 8130832: Extend the WhiteBox API to provide information about the availability of compiler intrinsics Add a new method, sun.hotspot.WhiteBox.isIntrinsicAvailable, that can be used to determine if an intrinsic is available. Reviewed-by: kvn, jrose --- test/lib/sun/hotspot/WhiteBox.java | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/test/lib/sun/hotspot/WhiteBox.java b/test/lib/sun/hotspot/WhiteBox.java index 17ade810b77..af98de09e3d 100644 --- a/test/lib/sun/hotspot/WhiteBox.java +++ b/test/lib/sun/hotspot/WhiteBox.java @@ -182,6 +182,30 @@ public class WhiteBox { Objects.requireNonNull(method); return isMethodQueuedForCompilation0(method); } + // Determine if the compiler corresponding to the compilation level 'compLevel' + // and to the compilation context 'compilation_context' provides an intrinsic + // for the method 'method'. An intrinsic is available for method 'method' if: + // - the intrinsic is enabled (by using the appropriate command-line flag) and + // - the platform on which the VM is running provides the instructions necessary + // for the compiler to generate the intrinsic code. + // + // The compilation context is related to using the DisableIntrinsic flag on a + // per-method level, see hotspot/src/share/vm/compiler/abstractCompiler.hpp + // for more details. + public boolean isIntrinsicAvailable(Executable method, + Executable compilationContext, + int compLevel) { + Objects.requireNonNull(method); + return isIntrinsicAvailable0(method, compilationContext, compLevel); + } + // If usage of the DisableIntrinsic flag is not expected (or the usage can be ignored), + // use the below method that does not require the compilation context as argument. + public boolean isIntrinsicAvailable(Executable method, int compLevel) { + return isIntrinsicAvailable(method, null, compLevel); + } + private native boolean isIntrinsicAvailable0(Executable method, + Executable compilationContext, + int compLevel); public int deoptimizeMethod(Executable method) { return deoptimizeMethod(method, false /*not osr*/); } From 46b084bd8c7d08a5c501b3b4ae88e07dc93e03c2 Mon Sep 17 00:00:00 2001 From: Naoto Sato Date: Mon, 3 Aug 2015 21:49:23 -0700 Subject: [PATCH 2/2] 8129881: JDK-8008577 breaks Nashorn test 8130845: Change to CLDR Locale data in JDK 9 b71 causes SimpleDateFormat parsing errors 8132125: German (Switzerland) formatting broken if CLDR Locale Data is used Reviewed-by: tbell, okutsu --- make/Main.gmk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/make/Main.gmk b/make/Main.gmk index 13997430bb4..c25856f5e3a 100644 --- a/make/Main.gmk +++ b/make/Main.gmk @@ -78,11 +78,14 @@ interim-corba: interim-rmic: +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk) +interim-cldrconverter: + +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk) + buildtools-jdk: +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Tools.gmk java-tools) ALL_TARGETS += buildtools-langtools interim-langtools interim-corba \ - interim-rmic buildtools-jdk + interim-rmic interim-cldrconverter buildtools-jdk ################################################################################ # Special targets for certain modules @@ -345,7 +348,7 @@ else interim-langtools: $(LANGTOOLS_GENSRC_TARGETS) - buildtools-jdk: interim-langtools + buildtools-jdk: interim-langtools interim-cldrconverter $(CORBA_GENSRC_TARGETS): interim-langtools