From a3c0889315e194a7100ec989c5ecc1d9621a03b6 Mon Sep 17 00:00:00 2001 From: Serguei Spitsyn Date: Wed, 25 Feb 2015 01:02:04 -0800 Subject: [PATCH 01/97] 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale Add new test java/lang/instrument/ManyMethodsBenchmarkAgent.java Reviewed-by: coleenp, dcubed --- .../instrument/ManyMethodsBenchmarkAgent.java | 75 ++++++++++ .../instrument/ManyMethodsBenchmarkApp.java | 141 ++++++++++++++++++ 2 files changed, 216 insertions(+) create mode 100644 jdk/test/java/lang/instrument/ManyMethodsBenchmarkAgent.java create mode 100644 jdk/test/java/lang/instrument/ManyMethodsBenchmarkApp.java diff --git a/jdk/test/java/lang/instrument/ManyMethodsBenchmarkAgent.java b/jdk/test/java/lang/instrument/ManyMethodsBenchmarkAgent.java new file mode 100644 index 00000000000..05f9f1942ff --- /dev/null +++ b/jdk/test/java/lang/instrument/ManyMethodsBenchmarkAgent.java @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8046246 + * @summary Tests and benchmarks the JVMTI RedefineClasses when a + * single class (and its parent) contains many methods. + * + * @run build ManyMethodsBenchmarkApp ManyMethodsBenchmarkAgent + * @run shell MakeJAR3.sh ManyMethodsBenchmarkAgent 'Can-Retransform-Classes: true' + * @run main/othervm -javaagent:ManyMethodsBenchmarkAgent.jar ManyMethodsBenchmarkApp + */ +import java.lang.instrument.*; + +public class ManyMethodsBenchmarkAgent +{ + public static boolean fail = false; + public static boolean completed = false; + private static Instrumentation instrumentation; + + public static void + premain( String agentArgs, + Instrumentation instrumentation) { + System.out.println("ManyMethodsBenchmarkAgent started"); + ManyMethodsBenchmarkAgent.instrumentation = instrumentation; + System.out.println("ManyMethodsBenchmarkAgent finished"); + } + + static void instr() { + System.out.println("ManyMethodsBenchmarkAgent.instr started"); + + Class[] allClasses = instrumentation.getAllLoadedClasses(); + + for (int i = 0; i < allClasses.length; i++) { + Class klass = allClasses[i]; + String name = klass.getName(); + if (!name.equals("Base")) { + continue; + } + System.err.println("Instrumenting the class: " + klass); + + try { + instrumentation.retransformClasses(klass); + } catch (Throwable e) { + System.err.println("Error: bad return from retransform: " + klass); + System.err.println(" ERROR: " + e); + fail = true; + } + } + completed = true; + System.out.println("ManyMethodsBenchmarkAgent.instr finished"); + } + +} diff --git a/jdk/test/java/lang/instrument/ManyMethodsBenchmarkApp.java b/jdk/test/java/lang/instrument/ManyMethodsBenchmarkApp.java new file mode 100644 index 00000000000..c85bf42b820 --- /dev/null +++ b/jdk/test/java/lang/instrument/ManyMethodsBenchmarkApp.java @@ -0,0 +1,141 @@ +/* + * Copyright 2015 Google Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.io.File; +import java.io.FileWriter; +import java.io.PrintStream; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Type; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.Arrays; +import java.util.List; +import javax.tools.JavaCompiler; +import javax.tools.StandardJavaFileManager; +import javax.tools.ToolProvider; + +/** + * A manual benchmark of the JVMTI RedefineClasses when a + * single class (and its parent) contains many methods. + */ +public class ManyMethodsBenchmarkApp { + // Limit is 64k but we can not put such many as the CP limit is 32k. + // In practice, it means a real limit is much lower (less than 22000). + static final int METHOD_COUNT = 20000; + + static Class loadClassInNewClassLoader(String className) throws Exception { + URL[] urls = { new File(".").toURI().toURL() }; + URLClassLoader ucl = new URLClassLoader(urls, null); + Class klazz = Class.forName(className, true, ucl); + return klazz; + } + + static void benchmarkClassOperations(String className) throws Exception { + Class klazz = loadClassInNewClassLoader(className); + + Method[] methods = klazz.getDeclaredMethods(); + if (methods.length != METHOD_COUNT) { + throw new AssertionError("unexpected method count: " + methods.length + + " expected: " + METHOD_COUNT); + } + + methods = klazz.getMethods(); + // returned methods includes those inherited from Object + int objectMethodSlop = 100; + if (methods.length <= METHOD_COUNT || + methods.length >= METHOD_COUNT + objectMethodSlop) { + throw new AssertionError("unexpected method count: " + methods.length); + } + + // Invoke methods to make them appear in the constant pool cache + Object obj = klazz.newInstance(); + Object[] args = new Object[0]; + for (Method m: methods) { + try { + Class[] types = m.getParameterTypes(); + String name = m.getName(); + // System.out.println("method: " + name + "; argno: " + types.length); + if (types.length == 0 && name.length() == 2 && name.startsWith("f")) { + m.invoke(obj, args); + } + } catch (InvocationTargetException ex) { + ex.printStackTrace(); + } + } + } + + public static void main(String[] args) throws Exception { + System.out.println("test started: ManyMethodsBenchmarkApp"); + + // Create source files with many methods + File base = new File("Base.java"); + try (FileWriter fw = new FileWriter(base)) { + fw.write("public class Base {\n"); + final int L = 10; + // Each of the first L methods makes calls to its own chunk of METHOD_COUNT/L methods + for (int k = 0; k < L; k++) { + fw.write(" public void f" + k + "() {\n"); + int shift = (k == 0) ? L : 0; + for (int i = (k * (METHOD_COUNT/L)) + shift; i < (k + 1) * METHOD_COUNT/L; i++) { + fw.write(" f" + i + "();\n"); + } + fw.write(" }\n"); + } + + // The rest of (METHOD_COUNT - L) methods have empty body + for (int i = L; i < METHOD_COUNT; i++) { + fw.write(" public static void f" + i + "() {}\n"); + } + fw.write("}\n"); + } + + // Compile the generated source files. + JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); + List files = Arrays.asList(new File[] { base }); + try (StandardJavaFileManager fileManager = + compiler.getStandardFileManager(null, null, null)) { + compiler.getTask(null, fileManager, null, null, null, + fileManager.getJavaFileObjectsFromFiles(files)) + .call(); + } + + benchmarkClassOperations("Base"); + + ManyMethodsBenchmarkAgent.instr(); + + // Cleanup + base.delete(); + new File("Base.class").delete(); + if (!ManyMethodsBenchmarkAgent.completed) { + throw new Exception("ERROR: ManyMethodsBenchmarkAgent did not complete."); + } + + if (ManyMethodsBenchmarkAgent.fail) { + throw new Exception("ERROR: ManyMethodsBenchmarkAgent failed."); + } else { + System.out.println("ManyMethodsBenchmarkAgent succeeded."); + } + System.out.println("test finished: ManyMethodsBenchmarkApp"); + } +} From 02614afbd146d397421307c4d8de0673f3be4d7a Mon Sep 17 00:00:00 2001 From: Zaiyao Liu Date: Fri, 6 Mar 2015 00:49:38 +0000 Subject: [PATCH 02/97] 8044193: Need to add known answer tests for AES cipher Added more tests for AES cipher using known test vectors. Reviewed-by: valeriep --- .../Cipher/AES/TestAESCiphers/Dynamic.java | 186 ++++++++++++++++++ .../TestAESWithDefaultProvider.java | 35 ++++ .../TestAESWithProviderChange.java | 39 ++++ .../TestAESWithRemoveAddProvider.java | 42 ++++ .../Cipher/AES/TestAESCiphers/testAES.policy | 6 + 5 files changed, 308 insertions(+) create mode 100644 jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/Dynamic.java create mode 100644 jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithDefaultProvider.java create mode 100644 jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java create mode 100644 jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithRemoveAddProvider.java create mode 100644 jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/testAES.policy diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/Dynamic.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/Dynamic.java new file mode 100644 index 00000000000..3aa6d29e8fe --- /dev/null +++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/Dynamic.java @@ -0,0 +1,186 @@ +/* + * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.io.PrintStream; +import java.security.NoSuchAlgorithmException; +import java.security.spec.AlgorithmParameterSpec; +import java.util.Arrays; +import java.util.Random; + +import javax.crypto.Cipher; +import javax.crypto.KeyGenerator; +import javax.crypto.SecretKey; +import javax.crypto.spec.IvParameterSpec; + +public class Dynamic { + + static final String ALGORITHM = "AES"; + static final String[] MODE = { + "ECb", "CbC", "CTR", "PCBC", "OFB", "OFB150", "cFB", "CFB7", + "cFB8", "cFB16", "cFB24", "cFB32", "Cfb40", "cfB48", "cfB56", + "cfB64", "cfB72", "cfB80", "cfB88", "cfB96", "cfb104", "cfB112", + "cfB120", "cfB128", "OFB8", "OFB16", "OFB24", "OFB32", "OFB40", + "OFB48", "OFB56", "OFB64", "OFB72", "OFB80", "OFB88", "OFB96", + "OFB104", "OFB112", "OFB120", "OFB128", "GCM" + }; + static final String[] PADDING = { + "NoPadding", "PKCS5Padding", "ISO10126Padding" + }; + static final String SUNJCE = "SunJCE"; + + Cipher ci = null; + byte[] iv = null; + AlgorithmParameterSpec aps = null; + SecretKey key = null; + int keyStrength; + static int DefaultSize = 128; + + public void run(String[] argv) throws Exception { + if (!runAllTest(argv, System.out)) { + throw new Exception("Test Failed"); + } + } + + protected boolean runAllTest(String argv[], PrintStream out) { + boolean result = true; + StringBuilder failedList = new StringBuilder(); + int failedCnt = 0; + int testCount = 0; + int padKinds; // how many kinds of padding mode such as PKCS5padding and + // NoPadding. + + try { + for (int i = 0; i < 3; i++) { + keyStrength = DefaultSize + i * 64; // obtain the key size 128, + // 192, 256 + + for (int j = 0; j < MODE.length; j++) { + if (MODE[j].equalsIgnoreCase("ECB") + || MODE[j].equalsIgnoreCase("PCBC") + || MODE[j].equalsIgnoreCase("CBC")) { + padKinds = PADDING.length; + } else { + padKinds = 1; + } + + for (int k = 0; k < padKinds; k++) { + testCount++; + try { + if (!runTest(ALGORITHM, MODE[j], PADDING[k])) { + result = false; + failedCnt++; + failedList.append(ALGORITHM + "/" + MODE[j] + + "/" + PADDING[k] + " "); + } + } catch (Exception e) { + e.printStackTrace(); + result = false; + failedCnt++; + failedList.append(ALGORITHM + "/" + MODE[j] + "/" + + PADDING[k] + " "); + } + + } + } + } + + if (result) { + out.println("STATUS:Passed. Test " + testCount + + " cases, All Passed"); + return true; + } + out.println("STATUS:Failed. " + failedCnt + " Failed: " + + failedList); + return false; + + } catch (Exception ex) { + ex.printStackTrace(); + out.println("STATUS:Failed. Unexpected Exception: " + ex); + return false; + } + } + + protected boolean runTest(String algo, String mo, String pad) + throws Exception { + boolean result = true; + try { + byte[] plainText = new byte[160000]; + new Random().nextBytes(plainText); + + String transformation = algo + "/" + mo + "/" + pad; + ci = Cipher.getInstance(transformation, SUNJCE); + KeyGenerator kg = KeyGenerator.getInstance(algo, SUNJCE); + if (keyStrength > Cipher.getMaxAllowedKeyLength(transformation)) { + // skip if this key length is larger than what's + // configured in the jce jurisdiction policy files + System.out.println(keyStrength + + " is larger than what's configured " + + "in the jce jurisdiction policy files"); + return result; + } + kg.init(keyStrength); + key = kg.generateKey(); + + if (!mo.equalsIgnoreCase("GCM")) { + ci.init(Cipher.ENCRYPT_MODE, key, aps); + } else { + ci.init(Cipher.ENCRYPT_MODE, key); + } + byte[] cipherText = new byte[ci.getOutputSize(plainText.length)]; + int offset = ci.update(plainText, 0, plainText.length, cipherText, + 0); + ci.doFinal(cipherText, offset); + + if (!mo.equalsIgnoreCase("ECB")) { + iv = ci.getIV(); + aps = new IvParameterSpec(iv); + } else { + aps = null; + } + + if (!mo.equalsIgnoreCase("GCM")) { + ci.init(Cipher.DECRYPT_MODE, key, aps); + } else { + ci.init(Cipher.DECRYPT_MODE, key, ci.getParameters()); + } + byte[] recoveredText = new byte[ci.getOutputSize(cipherText.length)]; + int len = ci.doFinal(cipherText, 0, cipherText.length, + recoveredText); + + byte[] tmp = new byte[len]; + for (int i = 0; i < len; i++) { + tmp[i] = recoveredText[i]; + } + + result = Arrays.equals(plainText, tmp); + } catch (NoSuchAlgorithmException nsaEx) { + nsaEx.printStackTrace(); + // CFB7 and OFB150 are negative test,SunJCE not support this + // algorithm + result = mo.equalsIgnoreCase("CFB7") + || mo.equalsIgnoreCase("OFB150"); + + } + return result; + } +} diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithDefaultProvider.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithDefaultProvider.java new file mode 100644 index 00000000000..132e79d9a35 --- /dev/null +++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithDefaultProvider.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8044193 + * @summary Test AES ciphers with different modes and padding schemes with + * default provider + */ + +public class TestAESWithDefaultProvider extends Dynamic { + public static void main(String argv[]) throws Exception { + new TestAESWithDefaultProvider().run(argv); + } +} diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java new file mode 100644 index 00000000000..8dec9f136a4 --- /dev/null +++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java @@ -0,0 +1,39 @@ +/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.security.Security; + +/* + * @test + * @bug 8044193 + * @summary Test AES ciphers with different modes and padding schemes after + * remove then add provider. + * @run main/othervm/policy=testAES.policy TestAESWithProviderChange + */ + +public class TestAESWithProviderChange extends Dynamic { + public static void main(String argv[]) throws Exception { + Security.removeProvider(SUNJCE); + Security.addProvider(new com.sun.crypto.provider.SunJCE()); + new TestAESWithProviderChange().run(argv); + } +} diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithRemoveAddProvider.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithRemoveAddProvider.java new file mode 100644 index 00000000000..81761a7ea4b --- /dev/null +++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithRemoveAddProvider.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.security.*; +import java.security.Provider; + +/* + * @test + * @bug 8044193 + * @summary Test AES ciphers with different modes and padding schemes after + * remove default provider then add it back. + * @run main/othervm/policy=testAES.policy TestAESWithRemoveAddProvider + */ + +public class TestAESWithRemoveAddProvider extends Dynamic { + public static void main(String argv[]) throws Exception { + Provider pJCE = Security.getProvider(SUNJCE); + Security.removeProvider(SUNJCE); + Security.addProvider(pJCE); + new TestAESWithRemoveAddProvider().run(argv); + } +} diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/testAES.policy b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/testAES.policy new file mode 100644 index 00000000000..a138a577ff7 --- /dev/null +++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/testAES.policy @@ -0,0 +1,6 @@ +grant +{ + permission java.security.SecurityPermission "removeProvider.SunJCE"; + permission java.security.SecurityPermission "insertProvider.SunJCE"; + permission java.security.SecurityPermission "putProviderProperty.SunJCE"; +}; From b035ca734821fa7874c9f6167183bb3e48f50109 Mon Sep 17 00:00:00 2001 From: Ivan Gerasimov Date: Fri, 6 Mar 2015 13:30:49 +0300 Subject: [PATCH 03/97] 8073692: (cs) Inconsistent docs for CharsetDecoder.replaceWith and CharsetEncoder.replaceWith Reviewed-by: martin --- .../java/nio/charset/Charset-X-Coder.java.template | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template b/jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template index f5e50a51c85..faa51bb45d4 100644 --- a/jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template +++ b/jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template @@ -266,16 +266,15 @@ public abstract class Charset$Coder$ { * method, passing the new replacement, after checking that the new * replacement is acceptable.

* - * @param newReplacement The replacement value - * + * @param newReplacement The new replacement; must not be + * null, must have non-zero length, #if[decoder] - * The new replacement; must not be null - * and must have non-zero length + * and must not be longer than the value returned by the + * {@link #max$ItypesPerOtype$() max$ItypesPerOtype$} method #end[decoder] #if[encoder] - * The new replacement; must not be null, must have - * non-zero length, must not be longer than the value returned by - * the {@link #max$ItypesPerOtype$() max$ItypesPerOtype$} method, and + * must not be longer than the value returned by the + * {@link #max$ItypesPerOtype$() max$ItypesPerOtype$} method, and * must be {@link #isLegalReplacement legal} #end[encoder] * From 2ae75ccaa18a95b6bc852f67303883cb5de53e55 Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Fri, 6 Mar 2015 09:02:26 -0800 Subject: [PATCH 04/97] 8074428: Move pack200, unpack200, libpack200 to jdk.pack200 Reviewed-by: alanb, weijun, erikj, ihse --- ...{Launcher-jdk.runtime.gmk => Launcher-jdk.pack200.gmk} | 8 ++++---- jdk/make/lib/{Lib-jdk.runtime.gmk => Lib-jdk.pack200.gmk} | 6 +++--- .../share/native/common-unpack/bands.cpp | 0 .../share/native/common-unpack/bands.h | 0 .../share/native/common-unpack/bytes.cpp | 0 .../share/native/common-unpack/bytes.h | 0 .../share/native/common-unpack/coding.cpp | 0 .../share/native/common-unpack/coding.h | 0 .../share/native/common-unpack/constants.h | 0 .../share/native/common-unpack/defines.h | 0 .../share/native/common-unpack/unpack.cpp | 0 .../share/native/common-unpack/unpack.h | 0 .../share/native/common-unpack/utils.cpp | 0 .../share/native/common-unpack/utils.h | 0 .../share/native/common-unpack/zip.cpp | 0 .../share/native/common-unpack/zip.h | 0 .../share/native/libunpack/jni.cpp | 0 .../share/native/unpack200/main.cpp | 0 .../windows/native/unpack200/unpack200_proto.exe.manifest | 0 19 files changed, 7 insertions(+), 7 deletions(-) rename jdk/make/launcher/{Launcher-jdk.runtime.gmk => Launcher-jdk.pack200.gmk} (94%) rename jdk/make/lib/{Lib-jdk.runtime.gmk => Lib-jdk.pack200.gmk} (92%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/bands.cpp (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/bands.h (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/bytes.cpp (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/bytes.h (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/coding.cpp (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/coding.h (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/constants.h (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/defines.h (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/unpack.cpp (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/unpack.h (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/utils.cpp (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/utils.h (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/zip.cpp (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/zip.h (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/libunpack/jni.cpp (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/unpack200/main.cpp (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/windows/native/unpack200/unpack200_proto.exe.manifest (100%) diff --git a/jdk/make/launcher/Launcher-jdk.runtime.gmk b/jdk/make/launcher/Launcher-jdk.pack200.gmk similarity index 94% rename from jdk/make/launcher/Launcher-jdk.runtime.gmk rename to jdk/make/launcher/Launcher-jdk.pack200.gmk index 366dc5cc9a2..1e6c21820cb 100644 --- a/jdk/make/launcher/Launcher-jdk.runtime.gmk +++ b/jdk/make/launcher/Launcher-jdk.pack200.gmk @@ -32,9 +32,9 @@ $(eval $(call SetupLauncher,pack200, \ # The order of the object files on the link command line affects the size of the resulting # binary (at least on linux) which causes the size to differ between old and new build. -UNPACKEXE_SRC := $(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \ - $(JDK_TOPDIR)/src/jdk.runtime/share/native/unpack200 -UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \ +UNPACKEXE_SRC := $(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack \ + $(JDK_TOPDIR)/src/jdk.pack200/share/native/unpack200 +UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack \ -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava @@ -96,7 +96,7 @@ $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \ -D "JDK_INTERNAL_NAME=unpack200" \ -D "JDK_FTYPE=0x1L", \ DEBUG_SYMBOLS := true, \ - MANIFEST := $(JDK_TOPDIR)/src/jdk.runtime/windows/native/unpack200/unpack200_proto.exe.manifest)) + MANIFEST := $(JDK_TOPDIR)/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest)) ifneq ($(USE_EXTERNAL_LIBZ), true) diff --git a/jdk/make/lib/Lib-jdk.runtime.gmk b/jdk/make/lib/Lib-jdk.pack200.gmk similarity index 92% rename from jdk/make/lib/Lib-jdk.runtime.gmk rename to jdk/make/lib/Lib-jdk.pack200.gmk index 4bf9b026cc1..eb8caa61485 100644 --- a/jdk/make/lib/Lib-jdk.runtime.gmk +++ b/jdk/make/lib/Lib-jdk.pack200.gmk @@ -30,14 +30,14 @@ include LibCommon.gmk $(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK, \ LIBRARY := unpack, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/jdk.runtime/share/native/libunpack \ - $(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack, \ + SRC := $(JDK_TOPDIR)/src/jdk.pack200/share/native/libunpack \ + $(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack, \ LANG := C++, \ OPTIMIZATION := LOW, \ CFLAGS := $(CXXFLAGS_JDKLIB) \ -DNO_ZLIB -DUNPACK_JNI -DFULL \ -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ - -I$(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \ + -I$(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack \ $(LIBJAVA_HEADER_FLAGS), \ CFLAGS_release := -DPRODUCT, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers, \ diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/bands.cpp b/jdk/src/jdk.pack200/share/native/common-unpack/bands.cpp similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/bands.cpp rename to jdk/src/jdk.pack200/share/native/common-unpack/bands.cpp diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/bands.h b/jdk/src/jdk.pack200/share/native/common-unpack/bands.h similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/bands.h rename to jdk/src/jdk.pack200/share/native/common-unpack/bands.h diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/bytes.cpp b/jdk/src/jdk.pack200/share/native/common-unpack/bytes.cpp similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/bytes.cpp rename to jdk/src/jdk.pack200/share/native/common-unpack/bytes.cpp diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/bytes.h b/jdk/src/jdk.pack200/share/native/common-unpack/bytes.h similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/bytes.h rename to jdk/src/jdk.pack200/share/native/common-unpack/bytes.h diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/coding.cpp b/jdk/src/jdk.pack200/share/native/common-unpack/coding.cpp similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/coding.cpp rename to jdk/src/jdk.pack200/share/native/common-unpack/coding.cpp diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/coding.h b/jdk/src/jdk.pack200/share/native/common-unpack/coding.h similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/coding.h rename to jdk/src/jdk.pack200/share/native/common-unpack/coding.h diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/constants.h b/jdk/src/jdk.pack200/share/native/common-unpack/constants.h similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/constants.h rename to jdk/src/jdk.pack200/share/native/common-unpack/constants.h diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/defines.h b/jdk/src/jdk.pack200/share/native/common-unpack/defines.h similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/defines.h rename to jdk/src/jdk.pack200/share/native/common-unpack/defines.h diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/unpack.cpp b/jdk/src/jdk.pack200/share/native/common-unpack/unpack.cpp similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/unpack.cpp rename to jdk/src/jdk.pack200/share/native/common-unpack/unpack.cpp diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/unpack.h b/jdk/src/jdk.pack200/share/native/common-unpack/unpack.h similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/unpack.h rename to jdk/src/jdk.pack200/share/native/common-unpack/unpack.h diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/utils.cpp b/jdk/src/jdk.pack200/share/native/common-unpack/utils.cpp similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/utils.cpp rename to jdk/src/jdk.pack200/share/native/common-unpack/utils.cpp diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/utils.h b/jdk/src/jdk.pack200/share/native/common-unpack/utils.h similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/utils.h rename to jdk/src/jdk.pack200/share/native/common-unpack/utils.h diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/zip.cpp b/jdk/src/jdk.pack200/share/native/common-unpack/zip.cpp similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/zip.cpp rename to jdk/src/jdk.pack200/share/native/common-unpack/zip.cpp diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/zip.h b/jdk/src/jdk.pack200/share/native/common-unpack/zip.h similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/zip.h rename to jdk/src/jdk.pack200/share/native/common-unpack/zip.h diff --git a/jdk/src/jdk.runtime/share/native/libunpack/jni.cpp b/jdk/src/jdk.pack200/share/native/libunpack/jni.cpp similarity index 100% rename from jdk/src/jdk.runtime/share/native/libunpack/jni.cpp rename to jdk/src/jdk.pack200/share/native/libunpack/jni.cpp diff --git a/jdk/src/jdk.runtime/share/native/unpack200/main.cpp b/jdk/src/jdk.pack200/share/native/unpack200/main.cpp similarity index 100% rename from jdk/src/jdk.runtime/share/native/unpack200/main.cpp rename to jdk/src/jdk.pack200/share/native/unpack200/main.cpp diff --git a/jdk/src/jdk.runtime/windows/native/unpack200/unpack200_proto.exe.manifest b/jdk/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest similarity index 100% rename from jdk/src/jdk.runtime/windows/native/unpack200/unpack200_proto.exe.manifest rename to jdk/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest From 014ea775ad18948b40233f978b1d565971ec9199 Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Fri, 6 Mar 2015 09:07:32 -0800 Subject: [PATCH 05/97] 8074429: Move jar, jarsigner tool to jdk.jartool module Reviewed-by: alanb, weijun, erikj, ihse --- jdk/make/gensrc/Gensrc-jdk.jartool.gmk | 44 +++++++++++++++++++ jdk/make/launcher/Launcher-jdk.dev.gmk | 6 --- jdk/make/launcher/Launcher-jdk.jartool.gmk | 32 ++++++++++++++ .../com/sun/jarsigner/ContentSigner.java | 0 .../jarsigner/ContentSignerParameters.java | 0 .../com/sun/jarsigner/package-info.java | 0 .../sun/security/tools/jarsigner/Main.java | 0 .../security/tools/jarsigner/Resources.java | 0 .../tools/jarsigner/Resources_ja.java | 0 .../tools/jarsigner/Resources_zh_CN.java | 0 .../tools/jarsigner/TimestampedSigner.java | 0 .../classes/sun/tools/jar/CommandLine.java | 0 .../classes/sun/tools/jar/JarException.java | 0 .../share/classes/sun/tools/jar/Main.java | 0 .../share/classes/sun/tools/jar/Manifest.java | 0 .../classes/sun/tools/jar/SignatureFile.java | 0 .../sun/tools/jar/resources/jar.properties | 0 .../sun/tools/jar/resources/jar_de.properties | 0 .../sun/tools/jar/resources/jar_es.properties | 0 .../sun/tools/jar/resources/jar_fr.properties | 0 .../sun/tools/jar/resources/jar_it.properties | 0 .../sun/tools/jar/resources/jar_ja.properties | 0 .../sun/tools/jar/resources/jar_ko.properties | 0 .../tools/jar/resources/jar_pt_BR.properties | 0 .../sun/tools/jar/resources/jar_sv.properties | 0 .../tools/jar/resources/jar_zh_CN.properties | 0 .../tools/jar/resources/jar_zh_TW.properties | 0 27 files changed, 76 insertions(+), 6 deletions(-) create mode 100644 jdk/make/gensrc/Gensrc-jdk.jartool.gmk create mode 100644 jdk/make/launcher/Launcher-jdk.jartool.gmk rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/com/sun/jarsigner/ContentSigner.java (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/com/sun/jarsigner/ContentSignerParameters.java (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/com/sun/jarsigner/package-info.java (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/security/tools/jarsigner/Main.java (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/security/tools/jarsigner/Resources.java (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/security/tools/jarsigner/Resources_ja.java (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/tools/jar/CommandLine.java (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/tools/jar/JarException.java (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/tools/jar/Main.java (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/tools/jar/Manifest.java (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/tools/jar/SignatureFile.java (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/tools/jar/resources/jar.properties (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/tools/jar/resources/jar_de.properties (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/tools/jar/resources/jar_es.properties (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/tools/jar/resources/jar_fr.properties (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/tools/jar/resources/jar_it.properties (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/tools/jar/resources/jar_ja.properties (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/tools/jar/resources/jar_ko.properties (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/tools/jar/resources/jar_pt_BR.properties (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/tools/jar/resources/jar_sv.properties (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/tools/jar/resources/jar_zh_CN.properties (100%) rename jdk/src/{jdk.dev => jdk.jartool}/share/classes/sun/tools/jar/resources/jar_zh_TW.properties (100%) diff --git a/jdk/make/gensrc/Gensrc-jdk.jartool.gmk b/jdk/make/gensrc/Gensrc-jdk.jartool.gmk new file mode 100644 index 00000000000..0fb8eabc621 --- /dev/null +++ b/jdk/make/gensrc/Gensrc-jdk.jartool.gmk @@ -0,0 +1,44 @@ +# +# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include GensrcCommon.gmk + +################################################################################ + +include GensrcProperties.gmk + +$(eval $(call SetupCompileProperties,COMPILE_PROPERTIES, \ + $(filter %.properties, \ + $(call CacheFind, \ + $(JDK_TOPDIR)/src/jdk.jartool/share/classes/sun/tools/jar/resources)), \ + ListResourceBundle)) + +TARGETS += $(COMPILE_PROPERTIES) + +################################################################################ + +all: $(TARGETS) + +.PHONY: all diff --git a/jdk/make/launcher/Launcher-jdk.dev.gmk b/jdk/make/launcher/Launcher-jdk.dev.gmk index 92b6d1bacb9..9dbe8a53b04 100644 --- a/jdk/make/launcher/Launcher-jdk.dev.gmk +++ b/jdk/make/launcher/Launcher-jdk.dev.gmk @@ -25,12 +25,6 @@ include LauncherCommon.gmk -$(eval $(call SetupLauncher,jar, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jar.Main"$(COMMA) }')) - -$(eval $(call SetupLauncher,jarsigner, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.jarsigner.Main"$(COMMA) }')) - ifndef BUILD_HEADLESS_ONLY $(eval $(call SetupLauncher,policytool, \ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.policytool.PolicyTool"$(COMMA) }',, \ diff --git a/jdk/make/launcher/Launcher-jdk.jartool.gmk b/jdk/make/launcher/Launcher-jdk.jartool.gmk new file mode 100644 index 00000000000..b6d44e315ff --- /dev/null +++ b/jdk/make/launcher/Launcher-jdk.jartool.gmk @@ -0,0 +1,32 @@ +# +# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +$(eval $(call SetupLauncher,jar, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jar.Main"$(COMMA) }')) + +$(eval $(call SetupLauncher,jarsigner, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.jarsigner.Main"$(COMMA) }')) diff --git a/jdk/src/jdk.dev/share/classes/com/sun/jarsigner/ContentSigner.java b/jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSigner.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/com/sun/jarsigner/ContentSigner.java rename to jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSigner.java diff --git a/jdk/src/jdk.dev/share/classes/com/sun/jarsigner/ContentSignerParameters.java b/jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSignerParameters.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/com/sun/jarsigner/ContentSignerParameters.java rename to jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSignerParameters.java diff --git a/jdk/src/jdk.dev/share/classes/com/sun/jarsigner/package-info.java b/jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/package-info.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/com/sun/jarsigner/package-info.java rename to jdk/src/jdk.jartool/share/classes/com/sun/jarsigner/package-info.java diff --git a/jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/Main.java b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/Main.java rename to jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java diff --git a/jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/Resources.java b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/Resources.java rename to jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java diff --git a/jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/Resources_ja.java b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/Resources_ja.java rename to jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java diff --git a/jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java rename to jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java diff --git a/jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java rename to jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java diff --git a/jdk/src/jdk.dev/share/classes/sun/tools/jar/CommandLine.java b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/CommandLine.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/tools/jar/CommandLine.java rename to jdk/src/jdk.jartool/share/classes/sun/tools/jar/CommandLine.java diff --git a/jdk/src/jdk.dev/share/classes/sun/tools/jar/JarException.java b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/JarException.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/tools/jar/JarException.java rename to jdk/src/jdk.jartool/share/classes/sun/tools/jar/JarException.java diff --git a/jdk/src/jdk.dev/share/classes/sun/tools/jar/Main.java b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Main.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/tools/jar/Main.java rename to jdk/src/jdk.jartool/share/classes/sun/tools/jar/Main.java diff --git a/jdk/src/jdk.dev/share/classes/sun/tools/jar/Manifest.java b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Manifest.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/tools/jar/Manifest.java rename to jdk/src/jdk.jartool/share/classes/sun/tools/jar/Manifest.java diff --git a/jdk/src/jdk.dev/share/classes/sun/tools/jar/SignatureFile.java b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/SignatureFile.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/tools/jar/SignatureFile.java rename to jdk/src/jdk.jartool/share/classes/sun/tools/jar/SignatureFile.java diff --git a/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar.properties b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar.properties rename to jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties diff --git a/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_de.properties b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_de.properties rename to jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties diff --git a/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_es.properties b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_es.properties similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_es.properties rename to jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_es.properties diff --git a/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_fr.properties b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_fr.properties similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_fr.properties rename to jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_fr.properties diff --git a/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_it.properties b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_it.properties similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_it.properties rename to jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_it.properties diff --git a/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_ja.properties b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_ja.properties rename to jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties diff --git a/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_ko.properties b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ko.properties similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_ko.properties rename to jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ko.properties diff --git a/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_pt_BR.properties b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_pt_BR.properties similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_pt_BR.properties rename to jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_pt_BR.properties diff --git a/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_sv.properties b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_sv.properties similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_sv.properties rename to jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_sv.properties diff --git a/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_zh_CN.properties b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_zh_CN.properties rename to jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties diff --git a/jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_zh_TW.properties b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_TW.properties similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/tools/jar/resources/jar_zh_TW.properties rename to jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_TW.properties From a1ffcbec36f4fe98e10671cf54a4062050d9349c Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Fri, 6 Mar 2015 09:11:42 -0800 Subject: [PATCH 06/97] 8074430: Move policytool to jdk.policytool module Reviewed-by: alanb, weijun, erikj, ihse --- jdk/make/launcher/Launcher-jdk.dev.gmk | 6 ------ .../classes/sun/security/tools/policytool/PolicyTool.java | 0 .../classes/sun/security/tools/policytool/Resources.java | 0 .../classes/sun/security/tools/policytool/Resources_de.java | 0 .../classes/sun/security/tools/policytool/Resources_es.java | 0 .../classes/sun/security/tools/policytool/Resources_fr.java | 0 .../classes/sun/security/tools/policytool/Resources_it.java | 0 .../classes/sun/security/tools/policytool/Resources_ja.java | 0 .../classes/sun/security/tools/policytool/Resources_ko.java | 0 .../sun/security/tools/policytool/Resources_pt_BR.java | 0 .../classes/sun/security/tools/policytool/Resources_sv.java | 0 .../sun/security/tools/policytool/Resources_zh_CN.java | 0 .../sun/security/tools/policytool/Resources_zh_HK.java | 0 .../sun/security/tools/policytool/Resources_zh_TW.java | 0 14 files changed, 6 deletions(-) rename jdk/src/{jdk.dev => jdk.policytool}/share/classes/sun/security/tools/policytool/PolicyTool.java (100%) rename jdk/src/{jdk.dev => jdk.policytool}/share/classes/sun/security/tools/policytool/Resources.java (100%) rename jdk/src/{jdk.dev => jdk.policytool}/share/classes/sun/security/tools/policytool/Resources_de.java (100%) rename jdk/src/{jdk.dev => jdk.policytool}/share/classes/sun/security/tools/policytool/Resources_es.java (100%) rename jdk/src/{jdk.dev => jdk.policytool}/share/classes/sun/security/tools/policytool/Resources_fr.java (100%) rename jdk/src/{jdk.dev => jdk.policytool}/share/classes/sun/security/tools/policytool/Resources_it.java (100%) rename jdk/src/{jdk.dev => jdk.policytool}/share/classes/sun/security/tools/policytool/Resources_ja.java (100%) rename jdk/src/{jdk.dev => jdk.policytool}/share/classes/sun/security/tools/policytool/Resources_ko.java (100%) rename jdk/src/{jdk.dev => jdk.policytool}/share/classes/sun/security/tools/policytool/Resources_pt_BR.java (100%) rename jdk/src/{jdk.dev => jdk.policytool}/share/classes/sun/security/tools/policytool/Resources_sv.java (100%) rename jdk/src/{jdk.dev => jdk.policytool}/share/classes/sun/security/tools/policytool/Resources_zh_CN.java (100%) rename jdk/src/{jdk.dev => jdk.policytool}/share/classes/sun/security/tools/policytool/Resources_zh_HK.java (100%) rename jdk/src/{jdk.dev => jdk.policytool}/share/classes/sun/security/tools/policytool/Resources_zh_TW.java (100%) diff --git a/jdk/make/launcher/Launcher-jdk.dev.gmk b/jdk/make/launcher/Launcher-jdk.dev.gmk index 9dbe8a53b04..b58545e5418 100644 --- a/jdk/make/launcher/Launcher-jdk.dev.gmk +++ b/jdk/make/launcher/Launcher-jdk.dev.gmk @@ -25,12 +25,6 @@ include LauncherCommon.gmk -ifndef BUILD_HEADLESS_ONLY - $(eval $(call SetupLauncher,policytool, \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.policytool.PolicyTool"$(COMMA) }',, \ - $(XLIBS))) -endif - $(eval $(call SetupLauncher,jdeps, \ -DEXPAND_CLASSPATH_WILDCARDS \ -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ diff --git a/jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/PolicyTool.java b/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/PolicyTool.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/PolicyTool.java rename to jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/PolicyTool.java diff --git a/jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources.java b/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources.java rename to jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources.java diff --git a/jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_de.java b/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_de.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_de.java rename to jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_de.java diff --git a/jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_es.java b/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_es.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_es.java rename to jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_es.java diff --git a/jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_fr.java b/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_fr.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_fr.java rename to jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_fr.java diff --git a/jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_it.java b/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_it.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_it.java rename to jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_it.java diff --git a/jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_ja.java b/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_ja.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_ja.java rename to jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_ja.java diff --git a/jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_ko.java b/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_ko.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_ko.java rename to jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_ko.java diff --git a/jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_pt_BR.java b/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_pt_BR.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_pt_BR.java rename to jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_pt_BR.java diff --git a/jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_sv.java b/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_sv.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_sv.java rename to jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_sv.java diff --git a/jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_zh_CN.java b/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_zh_CN.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_zh_CN.java rename to jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_zh_CN.java diff --git a/jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_zh_HK.java b/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_zh_HK.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_zh_HK.java rename to jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_zh_HK.java diff --git a/jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_zh_TW.java b/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_zh_TW.java similarity index 100% rename from jdk/src/jdk.dev/share/classes/sun/security/tools/policytool/Resources_zh_TW.java rename to jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/Resources_zh_TW.java From f9a9e68c05a9b72e907e70e81059fd9f89089c72 Mon Sep 17 00:00:00 2001 From: Brian Burkhalter Date: Fri, 6 Mar 2015 16:00:58 -0800 Subject: [PATCH 07/97] 8074460: Always print seeds used in [Splittable]Random instances in java.math tests Create a utility class which creates a pseudorandom number generator (PRNG) and retains the seed. Use this class in java.math tests which use a PRNG. Always print the seed value before the PRNG is used. Reviewed-by: darcy --- .../math/BigDecimal/StringConstructor.java | 22 ++--- .../java/math/BigInteger/BigIntegerTest.java | 96 ++++++++++--------- .../java/math/BigInteger/ModPow65537.java | 12 ++- jdk/test/java/math/BigInteger/PrimeTest.java | 12 ++- .../math/BigInteger/SymmetricRangeTests.java | 13 +-- jdk/test/java/math/RandomSeed.java | 81 ++++++++++++++++ 6 files changed, 162 insertions(+), 74 deletions(-) create mode 100644 jdk/test/java/math/RandomSeed.java diff --git a/jdk/test/java/math/BigDecimal/StringConstructor.java b/jdk/test/java/math/BigDecimal/StringConstructor.java index 992eb9dc1b8..c8051eb98a5 100644 --- a/jdk/test/java/math/BigDecimal/StringConstructor.java +++ b/jdk/test/java/math/BigDecimal/StringConstructor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,19 +23,20 @@ /* * @test - * @bug 4103117 4331084 4488017 4490929 6255285 6268365 - * @summary Tests the BigDecimal string constructor. + * @library .. + * @bug 4103117 4331084 4488017 4490929 6255285 6268365 8074460 + * @summary Tests the BigDecimal string constructor (use -Dseed=X to set PRNG seed). */ import java.math.*; -import java.util.Random; public class StringConstructor { - private static int seed = new Random().nextInt(); - private static Random rnd = new Random(seed); + private static RandomSeed rndSeed = new RandomSeed(false); public static void main(String[] args) throws Exception { + System.out.println("Random number generator seed = " + rndSeed.getSeed()); + constructWithError(""); constructWithError("+"); constructWithError("-"); @@ -71,19 +72,18 @@ public class StringConstructor { // Roundtrip tests for (int i=0; i<100; i++) { - int size = rnd.nextInt(100) + 1; - BigInteger bi = new BigInteger(size, rnd); - if (rnd.nextBoolean()) + int size = rndSeed.getRandom().nextInt(100) + 1; + BigInteger bi = new BigInteger(size, rndSeed.getRandom()); + if (rndSeed.getRandom().nextBoolean()) bi = bi.negate(); int decimalLength = bi.toString().length(); - int scale = rnd.nextInt(decimalLength); + int scale = rndSeed.getRandom().nextInt(decimalLength); BigDecimal bd = new BigDecimal(bi, scale); String bdString = bd.toString(); // System.err.println("bi" + bi.toString() + "\tscale " + scale); // System.err.println("bd string: " + bdString); BigDecimal bdDoppel = new BigDecimal(bdString); if (!bd.equals(bdDoppel)) { - System.err.println("Random number seed = " + seed); System.err.println("bd string: scale: " + bd.scale() + "\t" + bdString); System.err.println("bd doppel: scale: " + bdDoppel.scale() + diff --git a/jdk/test/java/math/BigInteger/BigIntegerTest.java b/jdk/test/java/math/BigInteger/BigIntegerTest.java index 4de80fad4fd..e1b36c0812b 100644 --- a/jdk/test/java/math/BigInteger/BigIntegerTest.java +++ b/jdk/test/java/math/BigInteger/BigIntegerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,8 +23,9 @@ /* * @test - * @bug 4181191 4161971 4227146 4194389 4823171 4624738 4812225 4837946 4026465 - * @summary tests methods in BigInteger + * @library .. + * @bug 4181191 4161971 4227146 4194389 4823171 4624738 4812225 4837946 4026465 8074460 + * @summary tests methods in BigInteger (use -Dseed=X to set PRNG seed) * @run main/timeout=400 BigIntegerTest * @author madbot */ @@ -35,7 +36,6 @@ import java.io.FileOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.math.BigInteger; -import java.util.Random; /** * This is a simple test class created to ensure that the results @@ -86,7 +86,8 @@ public class BigIntegerTest { static final int SIZE = 1000; // numbers per batch - static Random rnd = new Random(); + private static RandomSeed rndSeed = new RandomSeed(false); + static boolean failure = false; public static void constructor() { @@ -97,7 +98,7 @@ public class BigIntegerTest { int arrayLength = 23; int halfLength = arrayLength/2; byte[] array = new byte[arrayLength]; - rnd.nextBytes(array); + rndSeed.getRandom().nextBytes(array); int[][] offLen = new int[][] { // offset, length, num exceptions {-1, arrayLength, 1}, // negative offset @@ -161,7 +162,7 @@ public class BigIntegerTest { } byte[] magNonZeroLength = new byte[42]; - rnd.nextBytes(magNonZeroLength); + rndSeed.getRandom().nextBytes(magNonZeroLength); for (int signum = -1; signum <= 1; signum++) { BigInteger bi = new BigInteger(signum, magNonZeroLength, 0, 0); if (bi.compareTo(BigInteger.ZERO) != 0) { @@ -174,13 +175,13 @@ public class BigIntegerTest { for (int i = 0; i < SIZE; i++) { // create reference value via a different code path from those tested - BigInteger reference = new BigInteger(2 + rnd.nextInt(336), 4, rnd); + BigInteger reference = new BigInteger(2 + rndSeed.getRandom().nextInt(336), 4, rndSeed.getRandom()); byte[] refArray = reference.toByteArray(); int refLen = refArray.length; - int factor = rnd.nextInt(5); - int objLen = refArray.length + factor*rnd.nextInt(refArray.length) + 1; - int offset = rnd.nextInt(objLen - refLen); + int factor = rndSeed.getRandom().nextInt(5); + int objLen = refArray.length + factor*rndSeed.getRandom().nextInt(refArray.length) + 1; + int offset = rndSeed.getRandom().nextInt(objLen - refLen); byte[] objArray = new byte[objLen]; System.arraycopy(refArray, 0, objArray, offset, refLen); @@ -191,7 +192,7 @@ public class BigIntegerTest { failCount++; } - boolean isNegative = rnd.nextBoolean(); + boolean isNegative = rndSeed.getRandom().nextBoolean(); BigInteger signMag = new BigInteger(isNegative ? -1 : 1, objArray, offset, refLen); if (signMag.compareTo(isNegative ? reference.negate() : reference) != 0) { System.err.println("Sign-magnitude BigInteger not equal for offset " + @@ -208,7 +209,7 @@ public class BigIntegerTest { for (int i=0; i= lower; bits--) { for (int i = 0; i < 50; i++) { - BigInteger x = BigInteger.ONE.shiftLeft(bits - 1).or(new BigInteger(bits - 2, rnd)); + BigInteger x = BigInteger.ONE.shiftLeft(bits - 1).or(new BigInteger(bits - 2, rndSeed.getRandom())); for (int radix = Character.MIN_RADIX; radix < Character.MAX_RADIX; radix++) { String result = x.toString(radix); @@ -764,9 +765,9 @@ public class BigIntegerTest { int failCount = 0; for (int i=0; i<10; i++) { - BigInteger m = new BigInteger(100, 5, rnd); + BigInteger m = new BigInteger(100, 5, rndSeed.getRandom()); while(m.compareTo(BigInteger.ONE) != 1) - m = new BigInteger(100, 5, rnd); + m = new BigInteger(100, 5, rndSeed.getRandom()); BigInteger exp = m.subtract(BigInteger.ONE); BigInteger base = fetchNumber(order).abs(); while(base.compareTo(m) != -1) @@ -826,7 +827,7 @@ public class BigIntegerTest { // Test consistency for(int i=0; i<10; i++) { - p1 = BigInteger.probablePrime(100, rnd); + p1 = BigInteger.probablePrime(100, rndSeed.getRandom()); if (!p1.isProbablePrime(100)) { System.err.println("Consistency "+p1.toString(16)); failCount++; @@ -867,7 +868,7 @@ public class BigIntegerTest { // Numbers of the form (6k+1)(12k+1)(18k+1) are Carmichael numbers if // each of the factors is prime int found = 0; - BigInteger f1 = new BigInteger(40, 100, rnd); + BigInteger f1 = new BigInteger(40, 100, rndSeed.getRandom()); while (found < NUM_CARMICHAELS_TO_TEST) { BigInteger k = null; BigInteger f2, f3; @@ -894,8 +895,8 @@ public class BigIntegerTest { // Test some composites that are products of 2 primes for (int i=0; i<50; i++) { - p1 = BigInteger.probablePrime(100, rnd); - p2 = BigInteger.probablePrime(100, rnd); + p1 = BigInteger.probablePrime(100, rndSeed.getRandom()); + p2 = BigInteger.probablePrime(100, rndSeed.getRandom()); c1 = p1.multiply(p2); if (c1.isProbablePrime(100)) { System.err.println("Composite failed "+c1.toString(16)); @@ -904,8 +905,8 @@ public class BigIntegerTest { } for (int i=0; i<4; i++) { - p1 = BigInteger.probablePrime(600, rnd); - p2 = BigInteger.probablePrime(600, rnd); + p1 = BigInteger.probablePrime(600, rndSeed.getRandom()); + p2 = BigInteger.probablePrime(600, rndSeed.getRandom()); c1 = p1.multiply(p2); if (c1.isProbablePrime(100)) { System.err.println("Composite failed "+c1.toString(16)); @@ -960,7 +961,7 @@ public class BigIntegerTest { // Next, pick some large primes, use nextProbablePrime to find the // next one, and make sure there are no primes in between for (int i=0; i<100; i+=10) { - p1 = BigInteger.probablePrime(50 + i, rnd); + p1 = BigInteger.probablePrime(50 + i, rndSeed.getRandom()); p2 = p1.add(ONE); p3 = p1.nextProbablePrime(); while(p2.compareTo(p3) < 0) { @@ -1025,7 +1026,7 @@ public class BigIntegerTest { } for(int i=0; i<10; i++) { - BigInteger b1 = fetchNumber(rnd.nextInt(100)); + BigInteger b1 = fetchNumber(rndSeed.getRandom().nextInt(100)); BigInteger b2 = null; File f = new File("serialtest"); try (FileOutputStream fos = new FileOutputStream(f)) { @@ -1059,6 +1060,7 @@ public class BigIntegerTest { * */ public static void main(String[] args) throws Exception { + System.out.println("Random number generator seed = " + rndSeed.getSeed()); // Some variables for sizing test numbers in bits int order1 = ORDER_MEDIUM; @@ -1131,8 +1133,8 @@ public class BigIntegerTest { * If order is less than 2, order is changed to 2. */ private static BigInteger fetchNumber(int order) { - boolean negative = rnd.nextBoolean(); - int numType = rnd.nextInt(7); + boolean negative = rndSeed.getRandom().nextBoolean(); + int numType = rndSeed.getRandom().nextInt(7); BigInteger result = null; if (order < 2) order = 2; @@ -1156,14 +1158,14 @@ public class BigIntegerTest { break; case 3: // One bit in number - result = BigInteger.ONE.shiftLeft(rnd.nextInt(order)); + result = BigInteger.ONE.shiftLeft(rndSeed.getRandom().nextInt(order)); break; case 4: // Random bit density byte[] val = new byte[(order+7)/8]; - int iterations = rnd.nextInt(order); + int iterations = rndSeed.getRandom().nextInt(order); for (int i=0; i 0) { - int runLength = Math.min(remaining, rnd.nextInt(order)); + int runLength = Math.min(remaining, rndSeed.getRandom().nextInt(order)); result = result.shiftLeft(runLength); if (bit > 0) result = result.add(ONE.shiftLeft(runLength).subtract(ONE)); @@ -1183,7 +1185,7 @@ public class BigIntegerTest { break; default: // random bits - result = new BigInteger(order, rnd); + result = new BigInteger(order, rndSeed.getRandom()); } if (negative) diff --git a/jdk/test/java/math/BigInteger/ModPow65537.java b/jdk/test/java/math/BigInteger/ModPow65537.java index ec962e2a5ff..f8e4a5422d1 100644 --- a/jdk/test/java/math/BigInteger/ModPow65537.java +++ b/jdk/test/java/math/BigInteger/ModPow65537.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,13 +23,13 @@ /* * @test - * @bug 4891312 - * @summary verify that modPow() not broken by the special case for 65537 + * @library .. + * @bug 4891312 8074460 + * @summary verify that modPow() not broken by the special case for 65537 (use -Dseed=X to set PRNG seed) * @author Andreas Sterbenz */ import java.math.BigInteger; -import java.util.*; import java.security.*; import java.security.spec.*; @@ -78,7 +78,9 @@ public class ModPow65537 { private static void testSigning(KeyPair kp) throws Exception { System.out.println(kp.getPublic()); byte[] data = new byte[1024]; - new Random().nextBytes(data); + RandomSeed rndSeed = new RandomSeed(false); + System.out.println("Random number generator seed = " + rndSeed.getSeed()); + rndSeed.getRandom().nextBytes(data); Signature sig = Signature.getInstance("SHA1withRSA", "SunRsaSign"); sig.initSign(kp.getPrivate()); diff --git a/jdk/test/java/math/BigInteger/PrimeTest.java b/jdk/test/java/math/BigInteger/PrimeTest.java index 5f5affeb240..fae4fd7979b 100644 --- a/jdk/test/java/math/BigInteger/PrimeTest.java +++ b/jdk/test/java/math/BigInteger/PrimeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,13 +25,13 @@ /* * @test - * @bug 8026236 - * @summary test primality verification methods in BigInteger + * @library .. + * @bug 8026236 8074460 + * @summary test primality verification methods in BigInteger (use -Dseed=X to set PRNG seed) * @author bpb */ import java.math.BigInteger; import java.util.BitSet; -import java.util.HashSet; import java.util.List; import java.util.NavigableSet; import java.util.Set; @@ -178,7 +178,9 @@ public class PrimeTest { } // Create a list of non-prime BigIntegers. - List nonPrimeBigInts = (new SplittableRandom()) + RandomSeed rndSeed = new RandomSeed(true); + System.out.println("Random number generator seed = " + rndSeed.getSeed()); + List nonPrimeBigInts = (rndSeed.getSplittableRandom()) .ints(NUM_NON_PRIMES, 2, maxPrime).mapToObj(BigInteger::valueOf) .filter(b -> !b.isProbablePrime(certainty)).collect(toList()); diff --git a/jdk/test/java/math/BigInteger/SymmetricRangeTests.java b/jdk/test/java/math/BigInteger/SymmetricRangeTests.java index b944a95d32f..d3cb73cbef2 100644 --- a/jdk/test/java/math/BigInteger/SymmetricRangeTests.java +++ b/jdk/test/java/math/BigInteger/SymmetricRangeTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 1025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,9 +24,10 @@ /* * @test * @ignore This test has huge memory requirements + * @library .. * @run main/timeout=180/othervm -Xmx8g SymmetricRangeTests - * @bug 6910473 8021204 8021203 9005933 - * @summary Test range of BigInteger values + * @bug 6910473 8021204 8021203 9005933 8074460 + * @summary Test range of BigInteger values (use -Dseed=X to set PRNG seed) * @author Dmitry Nadezhin */ import java.io.ByteArrayInputStream; @@ -35,7 +36,6 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.Arrays; -import java.util.Random; import java.math.BigInteger; public class SymmetricRangeTests { @@ -114,8 +114,9 @@ public class SymmetricRangeTests { System.out.println("Testing overflow in BitSieve.sieveSingle"); int bitLength = (5 << 27) - 1; try { - Random rnd = new Random(); - BigInteger actual = new BigInteger(bitLength, 0, rnd); + RandomSeed rndSeed = new RandomSeed(false); + System.out.println("Random number generator seed = " + rndSeed.getSeed()); + BigInteger actual = new BigInteger(bitLength, 0, rndSeed.getRandom()); throw new RuntimeException("new BigInteger(bitLength, 0, null).bitLength()=" + actual.bitLength()); } catch (ArithmeticException e) { // expected diff --git a/jdk/test/java/math/RandomSeed.java b/jdk/test/java/math/RandomSeed.java new file mode 100644 index 00000000000..494705c5fd6 --- /dev/null +++ b/jdk/test/java/math/RandomSeed.java @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.util.Random; +import java.util.SplittableRandom; + +public class RandomSeed { + private long seed = 0L; + private Random rnd = null; + private SplittableRandom srnd = null; + + public RandomSeed(boolean isSplittableRandom) { + init(isSplittableRandom); + } + + private void init(boolean isSplittableRandom) { + // obtain seed from environment if supplied + boolean isSeedProvided = false; + try { + // note that Long.valueOf(null) also throws a NumberFormatException + // so if the property is undefined this will still work correctly + seed = Long.valueOf(System.getProperty("seed")); + isSeedProvided = true; + } catch (NumberFormatException e) { + // do nothing: isSeedProvided is already false + } + + // if no seed from environment, create a fresh one + Random tmpRnd = null; + if (!isSeedProvided) { + tmpRnd = new Random(); + seed = tmpRnd.nextLong(); + } + + // create the PRNG + if (isSplittableRandom) { + srnd = new SplittableRandom(seed); + } else { + rnd = tmpRnd != null ? tmpRnd : new Random(); + rnd.setSeed(seed); + } + } + + public Random getRandom() { + if (rnd == null) { + throw new IllegalStateException("Variable of type Random not initialized"); + } + return rnd; + } + + public SplittableRandom getSplittableRandom() { + if (srnd == null) { + throw new IllegalStateException("Variable of type SplittableRandom not initialized"); + } + return srnd; + } + + public long getSeed() { + return seed; + } +} From 011b337a5120fceef4ea68883efc302f7f39846c Mon Sep 17 00:00:00 2001 From: Xueming Shen Date: Sat, 7 Mar 2015 10:11:03 -0800 Subject: [PATCH 08/97] 8074406: DateTimeFormatter.appendZoneOrOffsetId() fails to resolve a ZoneOffset for OffsetDateTime To support resolve OffsetDateTime from DTF.appendZoneOrOffset() Reviewed-by: rriggs --- .../classes/java/time/format/Parsed.java | 11 +- .../time/format/TCKZoneIdPrinterParser.java | 231 ++++++++++-------- 2 files changed, 144 insertions(+), 98 deletions(-) diff --git a/jdk/src/java.base/share/classes/java/time/format/Parsed.java b/jdk/src/java.base/share/classes/java/time/format/Parsed.java index 1eb88454414..58cbfaffbef 100644 --- a/jdk/src/java.base/share/classes/java/time/format/Parsed.java +++ b/jdk/src/java.base/share/classes/java/time/format/Parsed.java @@ -216,7 +216,16 @@ final class Parsed implements TemporalAccessor { return (R) (date != null ? LocalDate.from(date) : null); } else if (query == TemporalQueries.localTime()) { return (R) time; - } else if (query == TemporalQueries.zone() || query == TemporalQueries.offset()) { + } else if (query == TemporalQueries.offset()) { + Long offsetSecs = fieldValues.get(OFFSET_SECONDS); + if (offsetSecs != null) { + return (R) ZoneOffset.ofTotalSeconds(offsetSecs.intValue()); + } + if (zone instanceof ZoneOffset) { + return (R)zone; + } + return query.queryFrom(this); + } else if (query == TemporalQueries.zone()) { return query.queryFrom(this); } else if (query == TemporalQueries.precision()) { return null; // not a complete date/time diff --git a/jdk/test/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java b/jdk/test/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java index 122da8608c2..11e2dcd9620 100644 --- a/jdk/test/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java +++ b/jdk/test/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java @@ -152,144 +152,181 @@ public class TCKZoneIdPrinterParser { @DataProvider(name="parseSuccess") Object[][] data_parseSuccess() { return new Object[][] { - {"Z", 1, -1, ZoneId.of("Z")}, - {"UTC", 3, -1, ZoneId.of("UTC")}, - {"UT", 2, -1, ZoneId.of("UT")}, - {"GMT", 3, -1, ZoneId.of("GMT")}, + {"Z", 1, -1, ZoneId.of("Z"), true}, + {"UTC", 3, -1, ZoneId.of("UTC"), false}, + {"UT", 2, -1, ZoneId.of("UT"), false}, + {"GMT", 3, -1, ZoneId.of("GMT"), false}, - {"+00:00", 6, -1, ZoneOffset.UTC}, - {"UTC+00:00", 9, -1, ZoneId.of("UTC")}, - {"UT+00:00", 8, -1, ZoneId.of("UT")}, - {"GMT+00:00", 9, -1, ZoneId.of("GMT")}, - {"-00:00", 6, -1, ZoneOffset.UTC}, - {"UTC-00:00", 9, -1, ZoneId.of("UTC")}, - {"UT-00:00", 8, -1, ZoneId.of("UT")}, - {"GMT-00:00", 9, -1, ZoneId.of("GMT")}, + {"+00:00", 6, -1, ZoneOffset.UTC, true}, + {"UTC+00:00", 9, -1, ZoneId.of("UTC"), false}, + {"UT+00:00", 8, -1, ZoneId.of("UT"), false}, + {"GMT+00:00", 9, -1, ZoneId.of("GMT"), false}, + {"-00:00", 6, -1, ZoneOffset.UTC, true}, + {"UTC-00:00", 9, -1, ZoneId.of("UTC"), false}, + {"UT-00:00", 8, -1, ZoneId.of("UT"), false}, + {"GMT-00:00", 9, -1, ZoneId.of("GMT"), false}, - {"+01:30", 6, -1, ZoneOffset.ofHoursMinutes(1, 30)}, - {"UTC+01:30", 9, -1, ZoneId.of("UTC+01:30")}, - {"UT+02:30", 8, -1, ZoneId.of("UT+02:30")}, - {"GMT+03:30", 9, -1, ZoneId.of("GMT+03:30")}, - {"-01:30", 6, -1, ZoneOffset.ofHoursMinutes(-1, -30)}, - {"UTC-01:30", 9, -1, ZoneId.of("UTC-01:30")}, - {"UT-02:30", 8, -1, ZoneId.of("UT-02:30")}, - {"GMT-03:30", 9, -1, ZoneId.of("GMT-03:30")}, + {"+01:30", 6, -1, ZoneOffset.ofHoursMinutes(1, 30), true}, + {"UTC+01:30", 9, -1, ZoneId.of("UTC+01:30"), false}, + {"UT+02:30", 8, -1, ZoneId.of("UT+02:30"), false}, + {"GMT+03:30", 9, -1, ZoneId.of("GMT+03:30"), false}, + {"-01:30", 6, -1, ZoneOffset.ofHoursMinutes(-1, -30), true}, + {"UTC-01:30", 9, -1, ZoneId.of("UTC-01:30"), false}, + {"UT-02:30", 8, -1, ZoneId.of("UT-02:30"), false}, + {"GMT-03:30", 9, -1, ZoneId.of("GMT-03:30"), false}, // fallback to UTC - {"UTC-01:WW", 3, -1, ZoneId.of("UTC")}, - {"UT-02:WW", 2, -1, ZoneId.of("UT")}, - {"GMT-03:WW", 3, -1, ZoneId.of("GMT")}, - {"Z0", 1, -1, ZoneOffset.UTC}, - {"UTC1", 3, -1, ZoneId.of("UTC")}, + {"UTC-01:WW", 3, -1, ZoneId.of("UTC"), false}, + {"UT-02:WW", 2, -1, ZoneId.of("UT"), false}, + {"GMT-03:WW", 3, -1, ZoneId.of("GMT"), false}, + {"Z0", 1, -1, ZoneOffset.UTC, true}, + {"UTC1", 3, -1, ZoneId.of("UTC"), false}, // Z not parsed as zero - {"UTCZ", 3, -1, ZoneId.of("UTC")}, - {"UTZ", 2, -1, ZoneId.of("UT")}, - {"GMTZ", 3, -1, ZoneId.of("GMT")}, + {"UTCZ", 3, -1, ZoneId.of("UTC"), false}, + {"UTZ", 2, -1, ZoneId.of("UT"), false}, + {"GMTZ", 3, -1, ZoneId.of("GMT"), false}, // 0 not parsed - {"UTC0", 3, -1, ZoneId.of("UTC")}, - {"UT0", 2, -1, ZoneId.of("UT")}, + {"UTC0", 3, -1, ZoneId.of("UTC"), false}, + {"UT0", 2, -1, ZoneId.of("UT"), false}, // fail to parse - {"", 0, 0, null}, - {"A", 0, 0, null}, - {"UZ", 0, 0, null}, - {"GMA", 0, 0, null}, - {"0", 0, 0, null}, - {"+", 0, 0, null}, - {"-", 0, 0, null}, + {"", 0, 0, null, false}, + {"A", 0, 0, null, false}, + {"UZ", 0, 0, null, false}, + {"GMA", 0, 0, null, false}, + {"0", 0, 0, null, false}, + {"+", 0, 0, null, false}, + {"-", 0, 0, null, false}, // zone IDs - {"Europe/London", 13, -1, ZoneId.of("Europe/London")}, - {"America/New_York", 16, -1, ZoneId.of("America/New_York")}, - {"America/Bogusville", 0, 0, null}, + {"Europe/London", 13, -1, ZoneId.of("Europe/London"), false}, + {"America/New_York", 16, -1, ZoneId.of("America/New_York"), false}, + {"America/Bogusville", 0, 0, null, false}, }; } @Test(dataProvider="parseSuccess") - public void test_parseSuccess_plain(String text, int expectedIndex, int expectedErrorIndex, ZoneId expected) { + public void test_ZoneId_parseSuccess_plain( + String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset) + { builder.appendZoneId(); - TemporalAccessor parsed = builder.toFormatter().parseUnresolved(text, pos); - assertEquals(pos.getErrorIndex(), expectedErrorIndex, "Incorrect error index parsing: " + text); - assertEquals(pos.getIndex(), expectedIndex, "Incorrect index parsing: " + text); - if (expected != null) { - assertEquals(parsed.query(TemporalQueries.zoneId()), expected, "Incorrect zoneId parsing: " + text); - assertEquals(parsed.query(TemporalQueries.offset()), null, "Incorrect offset parsing: " + text); - assertEquals(parsed.query(TemporalQueries.zone()), expected, "Incorrect zone parsing: " + text); - } else { - assertEquals(parsed, null); - } + test(text, expectedIndex, expectedErrorIndex, expected, isZoneOffset); } @Test(dataProvider="parseSuccess") - public void test_parseSuccess_prefix(String text, int expectedIndex, int expectedErrorIndex, ZoneId expected) { + public void test_ZoneId_parseSuccess_prefix( + String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset) + { builder.appendZoneId(); pos.setIndex(3); - String prefixText = "XXX" + text; - TemporalAccessor parsed = builder.toFormatter().parseUnresolved(prefixText, pos); - assertEquals(pos.getErrorIndex(), expectedErrorIndex >= 0 ? expectedErrorIndex + 3 : expectedErrorIndex, "Incorrect error index parsing: " + prefixText); - assertEquals(pos.getIndex(), expectedIndex + 3, "Incorrect index parsing: " + prefixText); - if (expected != null) { - assertEquals(parsed.query(TemporalQueries.zoneId()), expected, "Incorrect zoneId parsing: " + prefixText); - assertEquals(parsed.query(TemporalQueries.offset()), null, "Incorrect offset parsing: " + prefixText); - assertEquals(parsed.query(TemporalQueries.zone()), expected, "Incorrect zone parsing: " + prefixText); - } else { - assertEquals(parsed, null); - } + test("XXX" + text, + expectedIndex + 3, + expectedErrorIndex >= 0 ? expectedErrorIndex + 3 : expectedErrorIndex, + expected, isZoneOffset); } @Test(dataProvider="parseSuccess") - public void test_parseSuccess_suffix(String text, int expectedIndex, int expectedErrorIndex, ZoneId expected) { + public void test_ZoneId_parseSuccess_suffix( + String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset) + { builder.appendZoneId(); - String suffixText = text + "XXX"; - TemporalAccessor parsed = builder.toFormatter().parseUnresolved(suffixText, pos); - assertEquals(pos.getErrorIndex(), expectedErrorIndex, "Incorrect error index parsing: " + suffixText); - assertEquals(pos.getIndex(), expectedIndex, "Incorrect index parsing: " + suffixText); - if (expected != null) { - assertEquals(parsed.query(TemporalQueries.zoneId()), expected, "Incorrect zoneId parsing: " + suffixText); - assertEquals(parsed.query(TemporalQueries.offset()), null, "Incorrect offset parsing: " + suffixText); - assertEquals(parsed.query(TemporalQueries.zone()), expected, "Incorrect zone parsing: " + suffixText); - } else { - assertEquals(parsed, null); - } + test(text + "XXX", expectedIndex, expectedErrorIndex, expected, isZoneOffset); } @Test(dataProvider="parseSuccess") - public void test_parseSuccess_caseSensitive(String text, int expectedIndex, int expectedErrorIndex, ZoneId expected) { + public void test_ZoneId_parseSuccess_caseSensitive( + String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset) + { builder.parseCaseSensitive().appendZoneId(); - String lcText = text.toLowerCase(Locale.ENGLISH); - TemporalAccessor parsed = builder.toFormatter().parseUnresolved(lcText, pos); + if (text.matches("[^A-Z]*[A-Z].*")) { // if input has letters + String lcText = text.toLowerCase(Locale.ENGLISH); + TemporalAccessor parsed = builder.toFormatter().parseUnresolved(lcText, pos); assertEquals(pos.getErrorIndex() >= 0, true); assertEquals(pos.getIndex(), 0); assertEquals(parsed, null); } else { - // case sensitive made no difference - assertEquals(pos.getIndex(), expectedIndex, "Incorrect index parsing: " + lcText); - assertEquals(pos.getErrorIndex(), expectedErrorIndex, "Incorrect error index parsing: " + lcText); - if (expected != null) { - assertEquals(parsed.query(TemporalQueries.zoneId()), expected); - assertEquals(parsed.query(TemporalQueries.offset()), null); - assertEquals(parsed.query(TemporalQueries.zone()), expected); - } else { - assertEquals(parsed, null); - } + test(text.toLowerCase(Locale.ENGLISH), expectedIndex, expectedErrorIndex, expected, isZoneOffset); } } @Test(dataProvider="parseSuccess") - public void test_parseSuccess_caseInsensitive(String text, int expectedIndex, int expectedErrorIndex, ZoneId expected) { + public void test_ZoneId_parseSuccess_caseInsensitive( + String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset) + { builder.parseCaseInsensitive().appendZoneId(); - String lcText = text.toLowerCase(Locale.ENGLISH); - TemporalAccessor parsed = builder.toFormatter().parseUnresolved(lcText, pos); - assertEquals(pos.getErrorIndex(), expectedErrorIndex, "Incorrect error index parsing: " + lcText); - assertEquals(pos.getIndex(), expectedIndex, "Incorrect index parsing: " + lcText); + test(text.toLowerCase(Locale.ENGLISH), expectedIndex, expectedErrorIndex, expected, isZoneOffset); + } + + @Test(dataProvider="parseSuccess") + public void test_ZoneOrOffsetId_parseSuccess_plain( + String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset) + { + builder.appendZoneOrOffsetId(); + test(text, expectedIndex, expectedErrorIndex, expected, isZoneOffset); + } + + @Test(dataProvider="parseSuccess") + public void test_ZoneOrOffsetId_parseSuccess_prefix( + String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset) + { + builder.appendZoneOrOffsetId(); + pos.setIndex(3); + test("XXX" + text, + expectedIndex + 3, + expectedErrorIndex >= 0 ? expectedErrorIndex + 3 : expectedErrorIndex, + expected, isZoneOffset); + } + + @Test(dataProvider="parseSuccess") + public void test_ZoneOrOffsetId_parseSuccess_suffix( + String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset) + { + builder.appendZoneOrOffsetId(); + test(text + "XXX", expectedIndex, expectedErrorIndex, expected, isZoneOffset); + } + + @Test(dataProvider="parseSuccess") + public void test_ZoneOrOffsetId_parseSuccess_caseSensitive( + String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset) + { + builder.parseCaseSensitive().appendZoneOrOffsetId(); + if (text.matches("[^A-Z]*[A-Z].*")) { // if input has letters + String lcText = text.toLowerCase(Locale.ENGLISH); + TemporalAccessor parsed = builder.toFormatter().parseUnresolved(lcText, pos); + assertEquals(pos.getErrorIndex() >= 0, true); + assertEquals(pos.getIndex(), 0); + assertEquals(parsed, null); + } else { + test(text.toLowerCase(Locale.ENGLISH), expectedIndex, expectedErrorIndex, expected, isZoneOffset); + } + } + + @Test(dataProvider="parseSuccess") + public void test_ZoneOrOffsetIdparseSuccess_caseInsensitive( + String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset) + { + builder.parseCaseInsensitive().appendZoneOrOffsetId(); + test(text.toLowerCase(Locale.ENGLISH), expectedIndex, expectedErrorIndex, expected, isZoneOffset); + } + + private void test(String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, + boolean isZoneOffset) { + TemporalAccessor parsed = builder.toFormatter().parseUnresolved(text, pos); + assertEquals(pos.getErrorIndex(), expectedErrorIndex, "Incorrect error index parsing: " + text); + assertEquals(pos.getIndex(), expectedIndex, "Incorrect index parsing: " + text); if (expected != null) { - ZoneId zid = parsed.query(TemporalQueries.zoneId()); - assertEquals(parsed.query(TemporalQueries.zoneId()), expected, "Incorrect zoneId parsing: " + lcText); - assertEquals(parsed.query(TemporalQueries.offset()), null, "Incorrect offset parsing: " + lcText); - assertEquals(parsed.query(TemporalQueries.zone()), expected, "Incorrect zone parsing: " + lcText); + assertEquals(parsed.query(TemporalQueries.zoneId()), + expected, + "Incorrect zoneId parsing: " + text); + assertEquals(parsed.query(TemporalQueries.offset()), + isZoneOffset ? expected : null, + "Incorrect offset parsing: " + text); + assertEquals(parsed.query(TemporalQueries.zone()), + expected, + "Incorrect zone parsing: " + text); } else { assertEquals(parsed, null); } From 64c0d9763008081556d73bd20b8f45f3994b7abe Mon Sep 17 00:00:00 2001 From: Kumar Srinivasan Date: Sat, 7 Mar 2015 15:21:36 -0800 Subject: [PATCH 09/97] 8074373: NMT is not enabled if NMT option is specified after class path specifiers Reviewed-by: dholmes --- jdk/src/java.base/share/native/libjli/java.c | 27 +++++++++++++------- jdk/test/tools/launcher/TestSpecialArgs.java | 20 ++++++++++++++- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/jdk/src/java.base/share/native/libjli/java.c b/jdk/src/java.base/share/native/libjli/java.c index 27e828fd60a..846e6835855 100644 --- a/jdk/src/java.base/share/native/libjli/java.c +++ b/jdk/src/java.base/share/native/libjli/java.c @@ -661,15 +661,24 @@ SetJvmEnvironment(int argc, char **argv) { * arguments are for the application (i.e. the main class name, or * the -jar argument). */ - if ((i > 0 && *arg != '-') - || JLI_StrCmp(arg, "-version") == 0 - || JLI_StrCmp(arg, "-fullversion") == 0 - || JLI_StrCmp(arg, "-help") == 0 - || JLI_StrCmp(arg, "-?") == 0 - || JLI_StrCmp(arg, "-jar") == 0 - || JLI_StrCmp(arg, "-X") == 0 - ) { - return; + if (i > 0) { + char *prev = argv[i - 1]; + // skip non-dash arg preceded by class path specifiers + if (*arg != '-' && + ((JLI_StrCmp(prev, "-cp") == 0 + || JLI_StrCmp(prev, "-classpath") == 0))) { + continue; + } + + if (*arg != '-' + || JLI_StrCmp(arg, "-version") == 0 + || JLI_StrCmp(arg, "-fullversion") == 0 + || JLI_StrCmp(arg, "-help") == 0 + || JLI_StrCmp(arg, "-?") == 0 + || JLI_StrCmp(arg, "-jar") == 0 + || JLI_StrCmp(arg, "-X") == 0) { + return; + } } /* * The following case checks for "-XX:NativeMemoryTracking=value". diff --git a/jdk/test/tools/launcher/TestSpecialArgs.java b/jdk/test/tools/launcher/TestSpecialArgs.java index 0e35f028521..307a4e06fb4 100644 --- a/jdk/test/tools/launcher/TestSpecialArgs.java +++ b/jdk/test/tools/launcher/TestSpecialArgs.java @@ -23,7 +23,7 @@ /* * @test - * @bug 7124089 7131021 8042469 8066185 + * @bug 7124089 7131021 8042469 8066185 8074373 * @summary Checks for Launcher special flags, such as MacOSX specific flags, * and JVM NativeMemoryTracking flags. * @compile -XDignore.symbol.file TestSpecialArgs.java EnvironmentVariables.java @@ -270,6 +270,16 @@ public class TestSpecialArgs extends TestHelper { tr = doExec(envMap, javaCmd, "Foo", "-XX:NativeMemoryTracking=summary"); checkTestResult(tr); + // should accept with no warnings + tr = doExec(javaCmd, "-cp", jarFile.getName(), + "-XX:NativeMemoryTracking=summary", "Foo"); + ensureNoWarnings(tr); + + // should accept with no warnings + tr = doExec(javaCmd, "-classpath", jarFile.getName(), + "-XX:NativeMemoryTracking=summary", "Foo"); + ensureNoWarnings(tr); + // make sure a missing class is handled correctly, because the class // resolution is performed by the JVM. tr = doExec(javaCmd, "AbsentClass", "-XX:NativeMemoryTracking=summary"); @@ -278,6 +288,14 @@ public class TestSpecialArgs extends TestHelper { } } + void ensureNoWarnings(TestResult tr) { + checkTestResult(tr); + if (tr.contains("warning: Native Memory Tracking")) { + System.err.println(tr.toString()); + throw new RuntimeException("Test Fails"); + } + } + void checkTestResult(TestResult tr) { if (!tr.isOK()) { System.err.println(tr.toString()); From 84afe48e4ffc2b9b2dd119d556c1112e5c7a188d Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Mon, 9 Mar 2015 10:39:50 +0100 Subject: [PATCH 10/97] 8074096: Disable (most) native warnings in JDK on a per-library basis Reviewed-by: erikj, tbell --- jdk/make/CompileDemos.gmk | 12 +++++-- jdk/make/launcher/Launcher-jdk.pack200.gmk | 5 ++- jdk/make/lib/Awt2dLibraries.gmk | 40 +++++++++++++++++++--- jdk/make/lib/CoreLibraries.gmk | 24 +++++++++++-- jdk/make/lib/Lib-java.security.jgss.gmk | 4 ++- jdk/make/lib/Lib-jdk.crypto.ec.gmk | 4 ++- jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk | 4 ++- jdk/make/lib/Lib-jdk.deploy.osx.gmk | 4 ++- jdk/make/lib/Lib-jdk.pack200.gmk | 7 +++- jdk/make/lib/NetworkingLibraries.gmk | 5 ++- jdk/make/lib/NioLibraries.gmk | 6 ++-- jdk/make/lib/PlatformLibraries.gmk | 4 +-- jdk/make/lib/SoundLibraries.gmk | 3 ++ 13 files changed, 101 insertions(+), 21 deletions(-) diff --git a/jdk/make/CompileDemos.gmk b/jdk/make/CompileDemos.gmk index ed7ba13082c..a56b020e09d 100644 --- a/jdk/make/CompileDemos.gmk +++ b/jdk/make/CompileDemos.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -219,6 +219,9 @@ define SetupJVMTIDemo # Param 7 = libs for solaris # Param 8 = libs for linux # Param 9 = extra directories with required sources + # Param 10 = DISABLED_WARNINGS_gcc + # Param 11 = DISABLED_WARNINGS_microsoft + # Param 12 = DISABLED_WARNINGS_clang BUILD_DEMO_JVMTI_$1_EXTRA_SRC := \ $$(wildcard $(DEMO_OS_TYPE_SRC)/jvmti/$1) \ $$(wildcard $$(addprefix $(DEMO_SHARE_SRC)/jvmti/, $2)) \ @@ -254,6 +257,9 @@ define SetupJVMTIDemo LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \ OPTIMIZATION := LOW, \ CXXFLAGS := $$($1_CXXFLAGS), \ + DISABLED_WARNINGS_gcc := $(10), \ + DISABLED_WARNINGS_clang := $(12), \ + DISABLED_WARNINGS_microsoft := $(11), \ LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \ LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \ LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \ @@ -310,13 +316,13 @@ define SetupJVMTIDemo endif endef -$(eval $(call SetupJVMTIDemo,compiledMethodLoad, agent_util)) +$(eval $(call SetupJVMTIDemo,compiledMethodLoad, agent_util, , , , , , , , pointer-to-int-cast format, , format)) $(eval $(call SetupJVMTIDemo,gctest, agent_util)) $(eval $(call SetupJVMTIDemo,heapTracker, agent_util java_crw_demo)) $(eval $(call SetupJVMTIDemo,heapViewer, agent_util)) $(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo)) $(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo)) -$(eval $(call SetupJVMTIDemo,waiters, agent_util, , C++)) +$(eval $(call SetupJVMTIDemo,waiters, agent_util, , C++, , , , , , , 4101)) $(eval $(call SetupJVMTIDemo,versionCheck, agent_util)) ################################################################################################## diff --git a/jdk/make/launcher/Launcher-jdk.pack200.gmk b/jdk/make/launcher/Launcher-jdk.pack200.gmk index 1e6c21820cb..6ee00f7ccd0 100644 --- a/jdk/make/launcher/Launcher-jdk.pack200.gmk +++ b/jdk/make/launcher/Launcher-jdk.pack200.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -79,6 +79,9 @@ $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \ CFLAGS_linux := -fPIC, \ CFLAGS_solaris := -KPIC, \ CFLAGS_macosx := -fPIC, \ + DISABLED_WARNINGS_gcc := sign-compare unused-result format-nonliteral \ + format-security parentheses, \ + DISABLED_WARNINGS_microsoft := 4267 4018, \ MAPFILE := $(UNPACK_MAPFILE),\ LDFLAGS := $(UNPACKEXE_ZIPOBJS) \ $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \ diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk index d7e50779625..549068675fd 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -55,6 +55,9 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \ OPTIMIZATION := HIGHEST, \ CFLAGS := $(CFLAGS_JDKLIB) \ $(BUILD_LIBMLIB_CFLAGS), \ + DISABLED_WARNINGS_gcc := parentheses, \ + DISABLED_WARNINGS_clang := parentheses, \ + DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -127,6 +130,7 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) CFLAGS := -xarch=sparcvis \ $(LIBMLIB_IMAGE_V_CFLAGS) \ $(CFLAGS_JDKLIB), \ + DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \ @@ -175,9 +179,6 @@ LIBAWT_CFLAGS += -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS) -ifeq ($(OPENJDK_TARGET_OS), macosx) -endif - ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) LIBAWT_CFLAGS += -DMLIB_ADD_SUFF LIBAWT_CFLAGS += -xarch=sparcvis @@ -253,6 +254,11 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT, \ LANG := $(LIBAWT_LANG), \ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \ + DISABLED_WARNINGS_gcc := sign-compare unused-result maybe-uninitialized \ + format-nonliteral parentheses, \ + DISABLED_WARNINGS_clang := logical-op-parentheses, \ + DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \ + DISABLED_WARNINGS_microsoft := 4297 4244 4267, \ ASFLAGS := $(LIBAWT_ASFLAGS), \ MAPFILE := $(LIBAWT_MAPFILE), \ LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -361,6 +367,11 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),) OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \ $(X_CFLAGS), \ + DISABLED_WARNINGS_gcc := type-limits pointer-to-int-cast \ + deprecated-declarations unused-result maybe-uninitialized format \ + format-security int-to-pointer-cast parentheses, \ + DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \ + E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(X_LIBS) $(LIBAWT_XAWT_LDFLAGS) \ @@ -417,6 +428,9 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \ $(LCMS_CFLAGS), \ CFLAGS_solaris := -xc99=no_lib, \ CFLAGS_windows := -DCMS_IS_WINDOWS_, \ + DISABLED_WARNINGS_gcc := format-nonliteral, \ + DISABLED_WARNINGS_clang := tautological-compare, \ + DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -495,6 +509,9 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \ CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJAVAJPEG_SRC)) \ $(LIBJAVA_HEADER_FLAGS) \ -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ + DISABLED_WARNINGS_gcc := clobbered parentheses, \ + DISABLED_WARNINGS_clang := logical-op-parentheses, \ + DISABLED_WARNINGS_microsoft := 4267, \ MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LIBJPEG_LIBS) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -563,6 +580,9 @@ ifeq ($(BUILD_HEADLESS), true) $(CUPS_CFLAGS) \ $(X_CFLAGS) \ $(LIBAWT_HEADLESS_CFLAGS), \ + DISABLED_WARNINGS_gcc := maybe-uninitialized int-to-pointer-cast, \ + DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \ + E_EMPTY_TRANSLATION_UNIT, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -644,6 +664,11 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \ CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \ OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \ CFLAGS_windows = -DCC_NOEX, \ + DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast reorder \ + delete-non-virtual-dtor, \ + DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types, \ + DISABLED_WARNINGS_solstudio := truncwarn, \ + DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090, \ MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \ LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -876,6 +901,10 @@ ifndef BUILD_HEADLESS_ONLY OPTIMIZATION := LOW, \ CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS), \ + DISABLED_WARNINGS_gcc := type-limits unused-result maybe-uninitialized, \ + DISABLED_WARNINGS_clang := incompatible-pointer-types, \ + DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST, \ + DISABLED_WARNINGS_microsoft := 4244 4267, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -946,6 +975,9 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) $(X_CFLAGS) \ $(X_LIBS) \ $(LIBAWT_LWAWT_CFLAGS), \ + DISABLED_WARNINGS_clang := incomplete-implementation \ + deprecated-declarations objc-method-access bitwise-op-parentheses \ + incompatible-pointer-types parentheses-equality extra-tokens, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN) \ -L$(INSTALL_LIBRARIES_HERE), \ diff --git a/jdk/make/lib/CoreLibraries.gmk b/jdk/make/lib/CoreLibraries.gmk index 7046e35b785..678af20a830 100644 --- a/jdk/make/lib/CoreLibraries.gmk +++ b/jdk/make/lib/CoreLibraries.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ WIN_VERIFY_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libverify/verify.lib ########################################################################################## -# libfdlibm is statically linked with libjava below and not delivered into the +# libfdlibm is statically linked with libjava below and not delivered into the # product on its own. BUILD_LIBFDLIBM_OPTIMIZATION := HIGH @@ -48,6 +48,8 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \ CFLAGS_windows_debug := -DLOGGING, \ CFLAGS_aix := -qfloat=nomaf, \ + DISABLED_WARNINGS_gcc := sign-compare, \ + DISABLED_WARNINGS_microsoft := 4146 4244 4018, \ ARFLAGS := $(ARFLAGS), \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) @@ -94,6 +96,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY, \ LANG := C, \ OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \ CFLAGS := $(CFLAGS_JDKLIB), \ + DISABLED_WARNINGS_microsoft := 4244 4267, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libverify/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -147,6 +150,10 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \ OPTIMIZATION := HIGH, \ CFLAGS := $(CFLAGS_JDKLIB) \ $(LIBJAVA_CFLAGS), \ + DISABLED_WARNINGS_gcc := type-limits format-nonliteral, \ + DISABLED_WARNINGS_clang := int-conversion, \ + DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \ + DISABLED_WARNINGS_microsoft := 4022 4267, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -209,6 +216,9 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \ -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \ -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \ CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \ + DISABLED_WARNINGS_gcc := parentheses, \ + DISABLED_WARNINGS_clang := dangling-else, \ + DISABLED_WARNINGS_microsoft := 4267, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libzip/mapfile-vers, \ REORDER := $(BUILD_LIBZIP_REORDER), \ LDFLAGS := $(LDFLAGS_JDKLIB) \ @@ -307,6 +317,12 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \ LANG := C, \ OPTIMIZATION := HIGH, \ CFLAGS := $(LIBJLI_CFLAGS), \ + DISABLED_WARNINGS_gcc := pointer-to-int-cast sign-compare format-nonliteral \ + parentheses, \ + DISABLED_WARNINGS_clang := implicit-function-declaration parentheses \ + int-conversion, \ + DISABLED_WARNINGS_solstudio := E_ASM_DISABLES_OPTIMIZATION E_NEWLINE_NOT_LAST, \ + DISABLED_WARNINGS_microsoft := 4244 4047 4267, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjli/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -355,6 +371,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows) LANG := C, \ OPTIMIZATION := HIGH, \ CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \ + DISABLED_WARNINGS_microsoft := 4244 4047 4267, \ ARFLAGS := $(ARFLAGS), \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) @@ -375,6 +392,8 @@ else ifeq ($(OPENJDK_TARGET_OS), macosx) LANG := C, \ OPTIMIZATION := HIGH, \ CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \ + DISABLED_WARNINGS_clang := implicit-function-declaration parentheses \ + int-conversion, \ LDFLAGS := -nostdlib -r, \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) @@ -401,4 +420,3 @@ else ifeq ($(OPENJDK_TARGET_OS), aix) TARGETS += $(BUILD_LIBJLI_STATIC) endif - diff --git a/jdk/make/lib/Lib-java.security.jgss.gmk b/jdk/make/lib/Lib-java.security.jgss.gmk index ba78eb4cc39..a92212f4b0e 100644 --- a/jdk/make/lib/Lib-java.security.jgss.gmk +++ b/jdk/make/lib/Lib-java.security.jgss.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -41,6 +41,7 @@ ifneq ($(OPENJDK_TARGET_OS), windows) CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2GSS_SRC)) \ $(LIBJAVA_HEADER_FLAGS) \ -I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \ + DISABLED_WARNINGS_gcc := pointer-to-int-cast, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2gss/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -82,6 +83,7 @@ ifneq ($(BUILD_CRYPTO), no) CFLAGS := $(CFLAGS_JDKLIB) \ $(addprefix -I, $(BUILD_LIBKRB5_SRC)) \ -I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \ + DISABLED_WARNINGS_clang := implicit-function-declaration, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_SUFFIX := $(BUILD_LIBKRB5_LIBS), \ diff --git a/jdk/make/lib/Lib-jdk.crypto.ec.gmk b/jdk/make/lib/Lib-jdk.crypto.ec.gmk index db75429ab6a..564eb402ae0 100644 --- a/jdk/make/lib/Lib-jdk.crypto.ec.gmk +++ b/jdk/make/lib/Lib-jdk.crypto.ec.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -54,6 +54,8 @@ ifeq ($(ENABLE_INTREE_EC), yes) -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \ CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \ $(BUILD_LIBSUNEC_FLAGS), \ + DISABLED_WARNINGS_gcc := sign-compare, \ + DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \ LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \ diff --git a/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk b/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk index bbd6bc37c88..0672aa3a359 100644 --- a/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk +++ b/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -39,6 +39,8 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11, \ CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2PKCS11_SRC)) \ $(LIBJAVA_HEADER_FLAGS) \ -I$(SUPPORT_OUTPUTDIR)/headers/jdk.crypto.pkcs11, \ + DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \ + DISABLED_WARNINGS_microsoft := 4013 4267, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pkcs11/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ diff --git a/jdk/make/lib/Lib-jdk.deploy.osx.gmk b/jdk/make/lib/Lib-jdk.deploy.osx.gmk index 628c17fbced..f68b9c065e3 100644 --- a/jdk/make/lib/Lib-jdk.deploy.osx.gmk +++ b/jdk/make/lib/Lib-jdk.deploy.osx.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -40,6 +40,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) CFLAGS := $(CFLAGS_JDKLIB) \ -I$(LIBAPPLESCRIPTENGINE_SRC) \ -I$(SUPPORT_OUTPUTDIR)/headers/jdk.deploy.osx, \ + DISABLED_WARNINGS_clang := implicit-function-declaration format, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_SUFFIX := -framework Cocoa \ @@ -71,6 +72,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) \ $(LIBOSX_CFLAGS), \ + DISABLED_WARNINGS_clang := deprecated-declarations, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.desktop \ $(call SET_SHARED_LIBRARY_ORIGIN), \ diff --git a/jdk/make/lib/Lib-jdk.pack200.gmk b/jdk/make/lib/Lib-jdk.pack200.gmk index eb8caa61485..37e32d0a725 100644 --- a/jdk/make/lib/Lib-jdk.pack200.gmk +++ b/jdk/make/lib/Lib-jdk.pack200.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -40,6 +40,11 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK, \ -I$(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack \ $(LIBJAVA_HEADER_FLAGS), \ CFLAGS_release := -DPRODUCT, \ + DISABLED_WARNINGS_gcc := conversion-null sign-compare format-security \ + format-nonliteral parentheses, \ + DISABLED_WARNINGS_clang := bool-conversion format-security, \ + DISABLED_WARNINGS_solstudio := truncwarn, \ + DISABLED_WARNINGS_microsoft := 4267 4018, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ diff --git a/jdk/make/lib/NetworkingLibraries.gmk b/jdk/make/lib/NetworkingLibraries.gmk index 57d86eabfb5..4231121123e 100644 --- a/jdk/make/lib/NetworkingLibraries.gmk +++ b/jdk/make/lib/NetworkingLibraries.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -33,6 +33,9 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBNET, \ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ $(LIBJAVA_HEADER_FLAGS) $(addprefix -I, $(LIBNET_SRC_DIRS)), \ + DISABLED_WARNINGS_gcc := format-nonliteral, \ + DISABLED_WARNINGS_clang := parentheses-equality constant-logical-operand, \ + DISABLED_WARNINGS_microsoft := 4244 4047 4133, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnet/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ diff --git a/jdk/make/lib/NioLibraries.gmk b/jdk/make/lib/NioLibraries.gmk index 9a6e3e07ced..fd973ccc535 100644 --- a/jdk/make/lib/NioLibraries.gmk +++ b/jdk/make/lib/NioLibraries.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -69,6 +69,9 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \ OPTIMIZATION := HIGH, \ CFLAGS := $(CFLAGS_JDKLIB) \ $(BUILD_LIBNIO_CFLAGS), \ + DISABLED_WARNINGS_gcc := type-limits, \ + DISABLED_WARNINGS_clang := tautological-compare, \ + DISABLED_WARNINGS_microsoft := 4244, \ MAPFILE := $(BUILD_LIBNIO_MAPFILE), \ LDFLAGS := $(LDFLAGS_JDKLIB) $(BUILD_LIBNIO_LDFLAGS) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -92,4 +95,3 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \ TARGETS += $(BUILD_LIBNIO) $(BUILD_LIBNIO): $(BUILD_LIBNET) - diff --git a/jdk/make/lib/PlatformLibraries.gmk b/jdk/make/lib/PlatformLibraries.gmk index 14592213e40..0035b1dfbbb 100644 --- a/jdk/make/lib/PlatformLibraries.gmk +++ b/jdk/make/lib/PlatformLibraries.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -38,6 +38,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) CFLAGS := $(CFLAGS_JDKLIB) \ $(addprefix -I, $(LIBOSXAPP_SRC)) \ -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ + DISABLED_WARNINGS_clang := objc-method-access objc-root-class, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_SUFFIX_macosx := \ @@ -59,4 +60,3 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) TARGETS += $(BUILD_LIBOSXAPP) endif - diff --git a/jdk/make/lib/SoundLibraries.gmk b/jdk/make/lib/SoundLibraries.gmk index ec3b99d8447..f123d179d7a 100644 --- a/jdk/make/lib/SoundLibraries.gmk +++ b/jdk/make/lib/SoundLibraries.gmk @@ -129,6 +129,8 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND, \ CFLAGS := $(CFLAGS_JDKLIB) \ $(LIBJSOUND_CFLAGS), \ CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \ + DISABLED_WARNINGS_clang := implicit-function-declaration \ + deprecated-writable-strings, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsound/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -175,6 +177,7 @@ ifneq ($(filter jsoundalsa, $(EXTRA_SOUND_JNI_LIBS)), ) -DUSE_PORTS=TRUE \ -DUSE_PLATFORM_MIDI_OUT=TRUE \ -DUSE_PLATFORM_MIDI_IN=TRUE, \ + DISABLED_WARNINGS_gcc := parentheses, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsoundalsa/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ From d0ff6ad56574d8c7e6371d9b2f75ab8adbe5da8e Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Mon, 9 Mar 2015 16:18:33 +0100 Subject: [PATCH 11/97] 8074690: Fix for JDK-8074429 was not complete Reviewed-by: alanb, erikj --- jdk/make/gensrc/Gensrc-jdk.dev.gmk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jdk/make/gensrc/Gensrc-jdk.dev.gmk b/jdk/make/gensrc/Gensrc-jdk.dev.gmk index 0c956abbc12..b8f57aa529e 100644 --- a/jdk/make/gensrc/Gensrc-jdk.dev.gmk +++ b/jdk/make/gensrc/Gensrc-jdk.dev.gmk @@ -32,8 +32,7 @@ include GensrcProperties.gmk $(eval $(call SetupCompileProperties,COMPILE_PROPERTIES, \ $(filter %.properties, \ $(call CacheFind, \ - $(JDK_TOPDIR)/src/jdk.dev/share/classes/jdk/tools/jimage/resources \ - $(JDK_TOPDIR)/src/jdk.dev/share/classes/sun/tools/jar/resources)), \ + $(JDK_TOPDIR)/src/jdk.dev/share/classes/jdk/tools/jimage/resources)), \ ListResourceBundle)) TARGETS += $(COMPILE_PROPERTIES) From 6e61892373ebff644d85c636479d8d4c5c30e188 Mon Sep 17 00:00:00 2001 From: Mark Sheppard Date: Mon, 9 Mar 2015 18:48:40 +0000 Subject: [PATCH 12/97] 8065078: NetworkInterface.getNetworkInterfaces() triggers intermittent test failures Reviewed-by: chegar --- .../native/libnet/NetworkInterface_winXP.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/jdk/src/java.base/windows/native/libnet/NetworkInterface_winXP.c b/jdk/src/java.base/windows/native/libnet/NetworkInterface_winXP.c index 2308a59b44b..c245045696e 100644 --- a/jdk/src/java.base/windows/native/libnet/NetworkInterface_winXP.c +++ b/jdk/src/java.base/windows/native/libnet/NetworkInterface_winXP.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,6 +28,7 @@ #include /* needed for htonl */ #include #include +#include #include "java_net_NetworkInterface.h" #include "jni_util.h" @@ -70,7 +71,7 @@ void printnifs (netif *netifPP, char *str) { #endif -static int bufsize = 1024; +static int bufsize = 4096; /* * return an array of IP_ADAPTER_ADDRESSES containing one element @@ -102,7 +103,11 @@ static int getAdapters (JNIEnv *env, IP_ADAPTER_ADDRESSES **adapters) { ret = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, adapterInfo, &len); if (ret == ERROR_BUFFER_OVERFLOW) { - IP_ADAPTER_ADDRESSES * newAdapterInfo = + IP_ADAPTER_ADDRESSES * newAdapterInfo = NULL; + if (len < (ULONG_MAX - bufsize)) { + len = len + bufsize; + } + newAdapterInfo = (IP_ADAPTER_ADDRESSES *) realloc (adapterInfo, len); if (newAdapterInfo == NULL) { free(adapterInfo); @@ -113,7 +118,6 @@ static int getAdapters (JNIEnv *env, IP_ADAPTER_ADDRESSES **adapters) { adapterInfo = newAdapterInfo; - bufsize = len; ret = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, adapterInfo, &len); } @@ -176,7 +180,11 @@ IP_ADAPTER_ADDRESSES *getAdapter (JNIEnv *env, jint index) { flags |= GAA_FLAG_INCLUDE_PREFIX; val = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, adapterInfo, &len); if (val == ERROR_BUFFER_OVERFLOW) { - IP_ADAPTER_ADDRESSES * newAdapterInfo = + IP_ADAPTER_ADDRESSES * newAdapterInfo = NULL; + if (len < (ULONG_MAX - bufsize)) { + len = len + bufsize; + } + newAdapterInfo = (IP_ADAPTER_ADDRESSES *) realloc (adapterInfo, len); if (newAdapterInfo == NULL) { free(adapterInfo); @@ -187,7 +195,6 @@ IP_ADAPTER_ADDRESSES *getAdapter (JNIEnv *env, jint index) { adapterInfo = newAdapterInfo; - bufsize = len; val = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, adapterInfo, &len); } From 47e85e2963edaa88cfc5a541d59f11db5d1b183b Mon Sep 17 00:00:00 2001 From: Jason Uh Date: Mon, 9 Mar 2015 17:21:07 -0700 Subject: [PATCH 13/97] 8073430: Deprecate security APIs that have been superseded Reviewed-by: mullan, weijun --- .../security/cert/internal/x509/X509V1CertImpl.java | 7 ++++++- .../share/classes/java/security/acl/Acl.java | 4 ++++ .../share/classes/java/security/acl/AclEntry.java | 6 +++++- .../java/security/acl/AclNotFoundException.java | 6 +++++- .../share/classes/java/security/acl/Group.java | 6 +++++- .../java/security/acl/LastOwnerException.java | 6 +++++- .../java/security/acl/NotOwnerException.java | 6 +++++- .../share/classes/java/security/acl/Owner.java | 5 ++++- .../share/classes/java/security/acl/Permission.java | 6 +++++- .../classes/java/security/acl/package-info.java | 10 ++++++---- .../javax/net/ssl/HandshakeCompletedEvent.java | 6 +++++- .../share/classes/javax/net/ssl/SSLSession.java | 6 +++++- .../classes/javax/security/cert/Certificate.java | 4 +++- .../security/cert/CertificateEncodingException.java | 4 +++- .../javax/security/cert/CertificateException.java | 4 +++- .../security/cert/CertificateExpiredException.java | 4 +++- .../cert/CertificateNotYetValidException.java | 4 +++- .../security/cert/CertificateParsingException.java | 4 +++- .../javax/security/cert/X509Certificate.java | 4 +++- .../classes/javax/security/cert/package-info.java | 11 ++++++----- .../https/AbstractDelegateHttpsURLConnection.java | 13 ++++++++++--- .../sun/net/www/protocol/https/HttpsClient.java | 7 ++++++- .../www/protocol/https/HttpsURLConnectionImpl.java | 7 ++++++- .../classes/sun/security/ssl/SSLSessionImpl.java | 7 ++++++- 24 files changed, 115 insertions(+), 32 deletions(-) diff --git a/jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java b/jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java index 07a31a0ef34..b9ffb200a81 100644 --- a/jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java +++ b/jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -45,8 +45,13 @@ import java.util.Vector; * The X509V1CertImpl class is used as a conversion wrapper around * sun.security.x509.X509Cert certificates when running under JDK1.1.x. * + * @deprecated This is the implementation class for the deprecated + * {@code javax.security.cert.X509Certificate} class. The classes in the + * {@code java.security.cert} package should be used instead. + * * @author Jeff Nisewanger */ +@Deprecated public class X509V1CertImpl extends X509Certificate implements Serializable { static final long serialVersionUID = -2048442350420423405L; private java.security.cert.X509Certificate wrappedCert; diff --git a/jdk/src/java.base/share/classes/java/security/acl/Acl.java b/jdk/src/java.base/share/classes/java/security/acl/Acl.java index cffb48e46a7..9131966a08e 100644 --- a/jdk/src/java.base/share/classes/java/security/acl/Acl.java +++ b/jdk/src/java.base/share/classes/java/security/acl/Acl.java @@ -82,8 +82,12 @@ import java.security.Principal; * @see java.security.acl.Acl#getPermissions * * @author Satish Dharmaraj + * + * @deprecated This package has been replaced by {@code java.security.Policy} + * and related classes since 1.2. */ +@Deprecated public interface Acl extends Owner { /** diff --git a/jdk/src/java.base/share/classes/java/security/acl/AclEntry.java b/jdk/src/java.base/share/classes/java/security/acl/AclEntry.java index cd9675f34a1..dd4e548ab47 100644 --- a/jdk/src/java.base/share/classes/java/security/acl/AclEntry.java +++ b/jdk/src/java.base/share/classes/java/security/acl/AclEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -50,7 +50,11 @@ import java.security.Principal; * @see java.security.acl.Acl * * @author Satish Dharmaraj + * + * @deprecated This package has been replaced by {@code java.security.Policy} + * and related classes since 1.2. */ +@Deprecated public interface AclEntry extends Cloneable { /** diff --git a/jdk/src/java.base/share/classes/java/security/acl/AclNotFoundException.java b/jdk/src/java.base/share/classes/java/security/acl/AclNotFoundException.java index 6f08e178e71..0a153e25665 100644 --- a/jdk/src/java.base/share/classes/java/security/acl/AclNotFoundException.java +++ b/jdk/src/java.base/share/classes/java/security/acl/AclNotFoundException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,7 +30,11 @@ package java.security.acl; * non-existent ACL (Access Control List). * * @author Satish Dharmaraj + * + * @deprecated This package has been replaced by {@code java.security.Policy} + * and related classes since 1.2. */ +@Deprecated public class AclNotFoundException extends Exception { private static final long serialVersionUID = 5684295034092681791L; diff --git a/jdk/src/java.base/share/classes/java/security/acl/Group.java b/jdk/src/java.base/share/classes/java/security/acl/Group.java index ebd9c445282..9ff69f563cb 100644 --- a/jdk/src/java.base/share/classes/java/security/acl/Group.java +++ b/jdk/src/java.base/share/classes/java/security/acl/Group.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -39,7 +39,11 @@ import java.security.Principal; * Principal or Group. * * @author Satish Dharmaraj + * + * @deprecated This package has been replaced by {@code java.security.Policy} + * and related classes since 1.2. */ +@Deprecated public interface Group extends Principal { /** diff --git a/jdk/src/java.base/share/classes/java/security/acl/LastOwnerException.java b/jdk/src/java.base/share/classes/java/security/acl/LastOwnerException.java index 196c8f1bd86..b25bf84d46c 100644 --- a/jdk/src/java.base/share/classes/java/security/acl/LastOwnerException.java +++ b/jdk/src/java.base/share/classes/java/security/acl/LastOwnerException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,7 +32,11 @@ package java.security.acl; * @see java.security.acl.Owner#deleteOwner * * @author Satish Dharmaraj + * + * @deprecated This package has been replaced by {@code java.security.Policy} + * and related classes since 1.2. */ +@Deprecated public class LastOwnerException extends Exception { private static final long serialVersionUID = -5141997548211140359L; diff --git a/jdk/src/java.base/share/classes/java/security/acl/NotOwnerException.java b/jdk/src/java.base/share/classes/java/security/acl/NotOwnerException.java index 0a4b04b22d5..68d214d7185 100644 --- a/jdk/src/java.base/share/classes/java/security/acl/NotOwnerException.java +++ b/jdk/src/java.base/share/classes/java/security/acl/NotOwnerException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,11 @@ package java.security.acl; * the object, but the Principal attempting the modification is not an owner. * * @author Satish Dharmaraj + * + * @deprecated This package has been replaced by {@code java.security.Policy} + * and related classes since 1.2. */ +@Deprecated public class NotOwnerException extends Exception { private static final long serialVersionUID = -5555597911163362399L; diff --git a/jdk/src/java.base/share/classes/java/security/acl/Owner.java b/jdk/src/java.base/share/classes/java/security/acl/Owner.java index 2f649d40b33..2a4999b277d 100644 --- a/jdk/src/java.base/share/classes/java/security/acl/Owner.java +++ b/jdk/src/java.base/share/classes/java/security/acl/Owner.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -36,7 +36,10 @@ import java.security.Principal; * * @see java.security.acl.Acl * + * @deprecated This package has been replaced by {@code java.security.Policy} + * and related classes since 1.2. */ +@Deprecated public interface Owner { /** diff --git a/jdk/src/java.base/share/classes/java/security/acl/Permission.java b/jdk/src/java.base/share/classes/java/security/acl/Permission.java index 380a0102cd0..236f10795f0 100644 --- a/jdk/src/java.base/share/classes/java/security/acl/Permission.java +++ b/jdk/src/java.base/share/classes/java/security/acl/Permission.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,11 @@ package java.security.acl; * a particular type of access to a resource. * * @author Satish Dharmaraj + * + * @deprecated This package has been replaced by {@code java.security.Policy} + * and related classes since 1.2. */ +@Deprecated public interface Permission { /** diff --git a/jdk/src/java.base/share/classes/java/security/acl/package-info.java b/jdk/src/java.base/share/classes/java/security/acl/package-info.java index fbe5a8de6b9..f0362fdf0b6 100644 --- a/jdk/src/java.base/share/classes/java/security/acl/package-info.java +++ b/jdk/src/java.base/share/classes/java/security/acl/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,10 +24,12 @@ */ /** - * The classes and interfaces in this package have been - * superseded by classes in the java.security package. - * See that package and, for example, java.security.Permission for details. + * The classes and interfaces in this package have been deprecated. + * The {@code java.security} package contains suitable replacements. + * See that package and, for example, {@code java.security.Permission} + * for details. * * @since 1.1 */ +@Deprecated package java.security.acl; diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java b/jdk/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java index f6abafaea85..fb5b8ed704d 100644 --- a/jdk/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java +++ b/jdk/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -152,7 +152,11 @@ public class HandshakeCompletedEvent extends EventObject * {@link javax.security.cert.X509Certificate} format). * @exception SSLPeerUnverifiedException if the peer is not verified. * @see #getPeerPrincipal() + * @deprecated The {@link #getPeerCertificates()} method that returns an + * array of {@code java.security.cert.Certificate} should + * be used instead. */ + @Deprecated public javax.security.cert.X509Certificate [] getPeerCertificateChain() throws SSLPeerUnverifiedException { diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLSession.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLSession.java index d98edf0b365..5f6317dd295 100644 --- a/jdk/src/java.base/share/classes/javax/net/ssl/SSLSession.java +++ b/jdk/src/java.base/share/classes/javax/net/ssl/SSLSession.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -272,7 +272,11 @@ public interface SSLSession { * @exception SSLPeerUnverifiedException if the peer's identity * has not been verified * @see #getPeerPrincipal() + * @deprecated The {@link #getPeerCertificates()} method that returns an + * array of {@code java.security.cert.Certificate} should + * be used instead. */ + @Deprecated public javax.security.cert.X509Certificate [] getPeerCertificateChain() throws SSLPeerUnverifiedException; diff --git a/jdk/src/java.base/share/classes/javax/security/cert/Certificate.java b/jdk/src/java.base/share/classes/javax/security/cert/Certificate.java index 10fd767c157..84fdefde609 100644 --- a/jdk/src/java.base/share/classes/javax/security/cert/Certificate.java +++ b/jdk/src/java.base/share/classes/javax/security/cert/Certificate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -57,9 +57,11 @@ import java.security.SignatureException; * * @since 1.4 * @see X509Certificate + * @deprecated Use the classes in {@code java.security.cert} instead. * * @author Hemma Prafullchandra */ +@Deprecated public abstract class Certificate { /** diff --git a/jdk/src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java b/jdk/src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java index 1496c754181..95fbcfbeb1e 100644 --- a/jdk/src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java +++ b/jdk/src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -38,7 +38,9 @@ package javax.security.cert; * * @since 1.4 * @author Hemma Prafullchandra + * @deprecated Use the classes in {@code java.security.cert} instead. */ +@Deprecated public class CertificateEncodingException extends CertificateException { private static final long serialVersionUID = -8187642723048403470L; diff --git a/jdk/src/java.base/share/classes/javax/security/cert/CertificateException.java b/jdk/src/java.base/share/classes/javax/security/cert/CertificateException.java index 68ee6798b8c..144bb97fe6a 100644 --- a/jdk/src/java.base/share/classes/javax/security/cert/CertificateException.java +++ b/jdk/src/java.base/share/classes/javax/security/cert/CertificateException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -38,7 +38,9 @@ package javax.security.cert; * @author Hemma Prafullchandra * @since 1.4 * @see Certificate + * @deprecated Use the classes in {@code java.security.cert} instead. */ +@Deprecated public class CertificateException extends Exception { private static final long serialVersionUID = -5757213374030785290L; diff --git a/jdk/src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java b/jdk/src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java index 7e4579f2ebe..9f4eb7d4aed 100644 --- a/jdk/src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java +++ b/jdk/src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,7 +40,9 @@ package javax.security.cert; * * @since 1.4 * @author Hemma Prafullchandra + * @deprecated Use the classes in {@code java.security.cert} instead. */ +@Deprecated public class CertificateExpiredException extends CertificateException { private static final long serialVersionUID = 5091601212177261883L; diff --git a/jdk/src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java b/jdk/src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java index 9a53daa661d..c5c67c7f61e 100644 --- a/jdk/src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java +++ b/jdk/src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,7 +40,9 @@ package javax.security.cert; * * @since 1.4 * @author Hemma Prafullchandra + * @deprecated Use the classes in {@code java.security.cert} instead. */ +@Deprecated public class CertificateNotYetValidException extends CertificateException { private static final long serialVersionUID = -8976172474266822818L; diff --git a/jdk/src/java.base/share/classes/javax/security/cert/CertificateParsingException.java b/jdk/src/java.base/share/classes/javax/security/cert/CertificateParsingException.java index 4378587bb70..cd1f6ac507c 100644 --- a/jdk/src/java.base/share/classes/javax/security/cert/CertificateParsingException.java +++ b/jdk/src/java.base/share/classes/javax/security/cert/CertificateParsingException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -39,7 +39,9 @@ package javax.security.cert; * * @since 1.4 * @author Hemma Prafullchandra + * @deprecated Use the classes in {@code java.security.cert} instead. */ +@Deprecated public class CertificateParsingException extends CertificateException { private static final long serialVersionUID = -8449352422951136229L; diff --git a/jdk/src/java.base/share/classes/javax/security/cert/X509Certificate.java b/jdk/src/java.base/share/classes/javax/security/cert/X509Certificate.java index 1ef7ddcb56a..666524a084c 100644 --- a/jdk/src/java.base/share/classes/javax/security/cert/X509Certificate.java +++ b/jdk/src/java.base/share/classes/javax/security/cert/X509Certificate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -124,7 +124,9 @@ import java.util.Date; * @see Certificate * @see java.security.cert.X509Extension * @see java.security.Security security properties + * @deprecated Use the classes in {@code java.security.cert} instead. */ +@Deprecated public abstract class X509Certificate extends Certificate { /* diff --git a/jdk/src/java.base/share/classes/javax/security/cert/package-info.java b/jdk/src/java.base/share/classes/javax/security/cert/package-info.java index c09a0eafabc..a1d7a34fae1 100644 --- a/jdk/src/java.base/share/classes/javax/security/cert/package-info.java +++ b/jdk/src/java.base/share/classes/javax/security/cert/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,15 +26,16 @@ /** * Provides classes for public key certificates. * - * These classes include a simplified version of the - * java.security.cert package. These classes were developed - * as part of the Java Secure Socket + * This package has been deprecated. These classes include a simplified + * version of the {@code java.security.cert} package. These classes were + * developed as part of the Java Secure Socket * Extension (JSSE). When JSSE was added to the J2SE version 1.4, this * package was added for backward-compatibility reasons only. * * New applications should not use this package, but rather - * java.security.cert. + * {@code java.security.cert}. * * @since 1.4 */ +@Deprecated package javax.security.cert; diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java index 3b8ff0c09af..9d70053d35f 100644 --- a/jdk/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java +++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -244,7 +244,9 @@ public abstract class AbstractDelegateHttpsURLConnection extends public java.security.cert.Certificate[] getServerCertificates() throws SSLPeerUnverifiedException { if (cachedResponse != null) { - List l = ((SecureCacheResponse)cachedResponse).getServerCertificateChain(); + List l = + ((SecureCacheResponse)cachedResponse) + .getServerCertificateChain(); if (l == null) { return null; } else { @@ -262,7 +264,12 @@ public abstract class AbstractDelegateHttpsURLConnection extends /** * Returns the server's X.509 certificate chain, or null if * the server did not authenticate. + * + * @deprecated This method returns the deprecated + * {@code javax.security.cert.X509Certificate} type. + * Use {@code getServerCertificates()} instead. */ + @Deprecated public javax.security.cert.X509Certificate[] getServerCertificateChain() throws SSLPeerUnverifiedException { if (cachedResponse != null) { @@ -271,7 +278,7 @@ public abstract class AbstractDelegateHttpsURLConnection extends if (http == null) { throw new IllegalStateException("connection not yet open"); } else { - return ((HttpsClient)http).getServerCertificateChain (); + return ((HttpsClient)http).getServerCertificateChain(); } } diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java index 30e9fb0840a..5bc55ed9e50 100644 --- a/jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java +++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -699,7 +699,12 @@ final class HttpsClient extends HttpClient /** * Returns the X.509 certificate chain with which the server * authenticated itself, or null if the server did not authenticate. + * + * @deprecated This method returns the deprecated + * {@code javax.security.cert.X509Certificate} type. + * Use {@code getServerCertificates()} instead. */ + @Deprecated javax.security.cert.X509Certificate [] getServerCertificateChain() throws SSLPeerUnverifiedException { diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java index c3067c044e0..5477b2cab80 100644 --- a/jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java +++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -204,7 +204,12 @@ public class HttpsURLConnectionImpl * NOTE: This method is not necessary for the version of this class * implementing javax.net.ssl.HttpsURLConnection, but provided for * compatibility with the com.sun.net.ssl.HttpsURLConnection version. + * + * @deprecated This method returns the deprecated + * {@code javax.security.cert.X509Certificate} type. + * Use {@code getServerCertificates()} instead. */ + @Deprecated public javax.security.cert.X509Certificate[] getServerCertificateChain() { try { return delegate.getServerCertificateChain(); diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java index b5f304b6b97..881c4bf82fb 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -464,8 +464,13 @@ final class SSLSessionImpl extends ExtendedSSLSession { * * @return array of peer X.509 certs, with the peer's own cert * first in the chain, and with the "root" CA last. + * + * @deprecated This method returns the deprecated + * {@code javax.security.cert.X509Certificate} type. + * Use {@code getPeerCertificates()} instead. */ @Override + @Deprecated public javax.security.cert.X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException { // From 24bf7ba966548dfde80a87c1b718031a1d200454 Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Mon, 9 Mar 2015 17:37:34 -0700 Subject: [PATCH 14/97] 8074714: Add javax/xml/jaxp/testng/validation to othervm.dirs in TEST.ROOT Reviewed-by: lancea --- jdk/test/TEST.ROOT | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdk/test/TEST.ROOT b/jdk/test/TEST.ROOT index 6df529bccbd..7b89da112cf 100644 --- a/jdk/test/TEST.ROOT +++ b/jdk/test/TEST.ROOT @@ -8,7 +8,7 @@ keys=2d dnd i18n othervm.dirs=java/awt java/beans javax/accessibility javax/imageio javax/sound javax/print javax/management com/sun/awt sun/awt sun/java2d sun/pisces # Tests that cannot run concurrently -exclusiveAccess.dirs=java/rmi/Naming java/util/prefs sun/management/jmxremote sun/tools/jstatd sun/security/mscapi java/util/stream +exclusiveAccess.dirs=java/rmi/Naming java/util/prefs sun/management/jmxremote sun/tools/jstatd sun/security/mscapi java/util/stream javax/xml/jaxp/testng/validation # Group definitions groups=TEST.groups [closed/TEST.groups] From f54b0ebdc29407bdcb83be5e43787dd957e6fe30 Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Mon, 9 Mar 2015 18:16:52 -0700 Subject: [PATCH 15/97] 8074788: Javadoc typo in PKCS8EncodedKeySpec Reviewed-by: xuelei --- .../share/classes/java/security/spec/PKCS8EncodedKeySpec.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdk/src/java.base/share/classes/java/security/spec/PKCS8EncodedKeySpec.java b/jdk/src/java.base/share/classes/java/security/spec/PKCS8EncodedKeySpec.java index 90a94ed3436..89bf11d94ae 100644 --- a/jdk/src/java.base/share/classes/java/security/spec/PKCS8EncodedKeySpec.java +++ b/jdk/src/java.base/share/classes/java/security/spec/PKCS8EncodedKeySpec.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -89,7 +89,7 @@ public class PKCS8EncodedKeySpec extends EncodedKeySpec { * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * @throws NullPointerException if {@code encodedKey} - * or {@algorithm} is null. + * or {@code algorithm} is null. * @throws IllegalArgumentException if {@code algorithm} is * the empty string {@code ""} * @since 1.9 From 71d53d5bb7d4f2c91ab3017e8b88e7cce50d1ad6 Mon Sep 17 00:00:00 2001 From: Amy Lu Date: Tue, 10 Mar 2015 13:30:21 +0100 Subject: [PATCH 16/97] 8074674: Doclint regression in java/util/regex/Matcher.java Reviewed-by: psandoz --- jdk/src/java.base/share/classes/java/util/regex/Matcher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdk/src/java.base/share/classes/java/util/regex/Matcher.java b/jdk/src/java.base/share/classes/java/util/regex/Matcher.java index 0fcd3eac11f..96cf39a6338 100644 --- a/jdk/src/java.base/share/classes/java/util/regex/Matcher.java +++ b/jdk/src/java.base/share/classes/java/util/regex/Matcher.java @@ -1183,7 +1183,7 @@ public final class Matcher implements MatchResult { * *

Given the regular expression dog, the input * "zzzdogzzzdogzzz", and the function - * mr -> mr.group().toUpperCase(), an invocation of this method on + * {@code mr -> mr.group().toUpperCase()}, an invocation of this method on * a matcher for that expression would yield the string * "zzzDOGzzzDOGzzz". * @@ -1405,7 +1405,7 @@ public final class Matcher implements MatchResult { * *

Given the regular expression dog, the input * "zzzdogzzzdogzzz", and the function - * mr -> mr.group().toUpperCase(), an invocation of this method on + * {@code mr -> mr.group().toUpperCase()}, an invocation of this method on * a matcher for that expression would yield the string * "zzzDOGzzzdogzzz". * From 367a429ff43ebb2b684914d607e11b608c0e2de0 Mon Sep 17 00:00:00 2001 From: Roger Riggs Date: Tue, 10 Mar 2015 16:44:45 -0400 Subject: [PATCH 17/97] 8058464: (process spec) ProcessBuilder.redirectXXX throws unspecified NPE Add a class level spec for null arguments throwing NPE in ProcessBuilder Reviewed-by: martin, alanb --- .../share/classes/java/lang/ProcessBuilder.java | 11 +++++------ jdk/test/java/lang/ProcessBuilder/Basic.java | 10 +++++++++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java b/jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java index 72b260309d6..940084cfbc6 100644 --- a/jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java +++ b/jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java @@ -171,6 +171,11 @@ import java.util.Map; * variables, first call {@link java.util.Map#clear() Map.clear()} * before adding environment variables. * + *

+ * Unless otherwise noted, passing a {@code null} argument to a constructor + * or method in this class will cause a {@link NullPointerException} to be + * thrown. + * * @author Martin Buchholz * @since 1.5 */ @@ -193,7 +198,6 @@ public final class ProcessBuilder * command. * * @param command the list containing the program and its arguments - * @throws NullPointerException if the argument is null */ public ProcessBuilder(List command) { if (command == null) @@ -228,8 +232,6 @@ public final class ProcessBuilder * * @param command the list containing the program and its arguments * @return this process builder - * - * @throws NullPointerException if the argument is null */ public ProcessBuilder command(List command) { if (command == null) @@ -554,7 +556,6 @@ public final class ProcessBuilder * } * * @param file The {@code File} for the {@code Redirect}. - * @throws NullPointerException if the specified file is null * @return a redirect to read from the specified file */ public static Redirect from(final File file) { @@ -581,7 +582,6 @@ public final class ProcessBuilder * } * * @param file The {@code File} for the {@code Redirect}. - * @throws NullPointerException if the specified file is null * @return a redirect to write to the specified file */ public static Redirect to(final File file) { @@ -612,7 +612,6 @@ public final class ProcessBuilder * } * * @param file The {@code File} for the {@code Redirect}. - * @throws NullPointerException if the specified file is null * @return a redirect to append to the specified file */ public static Redirect appendTo(final File file) { diff --git a/jdk/test/java/lang/ProcessBuilder/Basic.java b/jdk/test/java/lang/ProcessBuilder/Basic.java index 03d165f7111..cfc4d443ff8 100644 --- a/jdk/test/java/lang/ProcessBuilder/Basic.java +++ b/jdk/test/java/lang/ProcessBuilder/Basic.java @@ -26,7 +26,7 @@ * @bug 4199068 4738465 4937983 4930681 4926230 4931433 4932663 4986689 * 5026830 5023243 5070673 4052517 4811767 6192449 6397034 6413313 * 6464154 6523983 6206031 4960438 6631352 6631966 6850957 6850958 - * 4947220 7018606 7034570 4244896 5049299 8003488 8054494 + * 4947220 7018606 7034570 4244896 5049299 8003488 8054494 8058464 * @summary Basic tests for Process and Environment Variable code * @run main/othervm/timeout=300 Basic * @run main/othervm/timeout=300 -Djdk.lang.Process.launchMechanism=fork Basic @@ -941,6 +941,14 @@ public class Basic { () -> pb.redirectOutput(Redirect.from(ifile)), () -> pb.redirectError(Redirect.from(ifile))); + THROWS(NullPointerException.class, + () -> pb.redirectInput((File)null), + () -> pb.redirectOutput((File)null), + () -> pb.redirectError((File)null), + () -> pb.redirectInput((Redirect)null), + () -> pb.redirectOutput((Redirect)null), + () -> pb.redirectError((Redirect)null)); + THROWS(IOException.class, // Input file does not exist () -> pb.start()); From 8db87d223f2363ef654d66a2937de02a9c0b73ea Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Tue, 10 Mar 2015 13:55:47 -0700 Subject: [PATCH 18/97] 8074870: Really add javax/xml/jaxp/testng/validation to othervm.dirs in TEST.ROOT Reviewed-by: rriggs --- jdk/test/TEST.ROOT | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdk/test/TEST.ROOT b/jdk/test/TEST.ROOT index 7b89da112cf..20863c62a87 100644 --- a/jdk/test/TEST.ROOT +++ b/jdk/test/TEST.ROOT @@ -5,10 +5,10 @@ keys=2d dnd i18n # Tests that must run in othervm mode -othervm.dirs=java/awt java/beans javax/accessibility javax/imageio javax/sound javax/print javax/management com/sun/awt sun/awt sun/java2d sun/pisces +othervm.dirs=java/awt java/beans javax/accessibility javax/imageio javax/sound javax/print javax/management com/sun/awt sun/awt sun/java2d sun/pisces javax/xml/jaxp/testng/validation # Tests that cannot run concurrently -exclusiveAccess.dirs=java/rmi/Naming java/util/prefs sun/management/jmxremote sun/tools/jstatd sun/security/mscapi java/util/stream javax/xml/jaxp/testng/validation +exclusiveAccess.dirs=java/rmi/Naming java/util/prefs sun/management/jmxremote sun/tools/jstatd sun/security/mscapi java/util/stream # Group definitions groups=TEST.groups [closed/TEST.groups] From f825d1ff35e6f7a899dfc8e39ee3999b0c9916e4 Mon Sep 17 00:00:00 2001 From: Martin Buchholz Date: Wed, 4 Mar 2015 17:35:40 -0800 Subject: [PATCH 19/97] 8074577: Modernize Unsafe internal javadoc Use modern javadoc style Reviewed-by: jrose --- .../share/classes/sun/misc/Unsafe.java | 137 +++++++++--------- 1 file changed, 67 insertions(+), 70 deletions(-) diff --git a/jdk/src/java.base/share/classes/sun/misc/Unsafe.java b/jdk/src/java.base/share/classes/sun/misc/Unsafe.java index 15402d168cd..ef25c517f03 100644 --- a/jdk/src/java.base/share/classes/sun/misc/Unsafe.java +++ b/jdk/src/java.base/share/classes/sun/misc/Unsafe.java @@ -57,31 +57,29 @@ public final class Unsafe { * Provides the caller with the capability of performing unsafe * operations. * - *

The returned Unsafe object should be carefully guarded + *

The returned {@code Unsafe} object should be carefully guarded * by the caller, since it can be used to read and write data at arbitrary * memory addresses. It must never be passed to untrusted code. * - *

Most methods in this class are very low-level, and correspond to a + *

Most methods in this class are very low-level, and correspond to a * small number of hardware instructions (on typical machines). Compilers * are encouraged to optimize these methods accordingly. * - *

Here is a suggested idiom for using unsafe operations: + *

Here is a suggested idiom for using unsafe operations: * - * 

+     * 
 {@code
      * class MyTrustedClass {
      *   private static final Unsafe unsafe = Unsafe.getUnsafe();
      *   ...
      *   private long myCountAddress = ...;
      *   public int getCount() { return unsafe.getByte(myCountAddress); }
-     * }
-     *
+ * }} * - * (It may assist compilers to make the local variable be - * final.) + * (It may assist compilers to make the local variable {@code final}.) * - * @exception SecurityException if a security manager exists and its - * checkPropertiesAccess method doesn't allow - * access to the system properties. + * @throws SecurityException if a security manager exists and its + * {@code checkPropertiesAccess} method doesn't allow + * access to the system properties. */ @CallerSensitive public static Unsafe getUnsafe() { @@ -100,28 +98,27 @@ public final class Unsafe { /** * Fetches a value from a given Java variable. * More specifically, fetches a field or array element within the given - * object o at the given offset, or (if o is - * null) from the memory address whose numerical value is the given - * offset. + * object {@code o} at the given offset, or (if {@code o} is null) + * from the memory address whose numerical value is the given offset. *

* The results are undefined unless one of the following cases is true: *

    *
  • The offset was obtained from {@link #objectFieldOffset} on * the {@link java.lang.reflect.Field} of some Java field and the object - * referred to by o is of a class compatible with that + * referred to by {@code o} is of a class compatible with that * field's class. * - *
  • The offset and object reference o (either null or + *
  • The offset and object reference {@code o} (either null or * non-null) were both obtained via {@link #staticFieldOffset} * and {@link #staticFieldBase} (respectively) from the * reflective {@link Field} representation of some Java field. * - *
  • The object referred to by o is an array, and the offset - * is an integer of the form B+N*S, where N is - * a valid index into the array, and B and S are + *
  • The object referred to by {@code o} is an array, and the offset + * is an integer of the form {@code B+N*S}, where {@code N} is + * a valid index into the array, and {@code B} and {@code S} are * the values obtained by {@link #arrayBaseOffset} and {@link * #arrayIndexScale} (respectively) from the array's class. The value - * referred to is the Nth element of the array. + * referred to is the {@code N}th element of the array. * *
*

@@ -162,7 +159,7 @@ public final class Unsafe { * is stored into that variable. *

* The variable must be of the same type as the method - * parameter x. + * parameter {@code x}. * * @param o Java heap object in which the variable resides, if any, else * null @@ -184,9 +181,9 @@ public final class Unsafe { /** * Stores a reference value into a given Java variable. *

- * Unless the reference x being stored is either null + * Unless the reference {@code x} being stored is either null * or matches the field type, the results are undefined. - * If the reference o is non-null, car marks or + * If the reference {@code o} is non-null, car marks or * other store barriers for that object (if the VM requires them) * are updated. * @see #putInt(Object, long, int) @@ -272,11 +269,11 @@ public final class Unsafe { * zero, or does not point into a block obtained from {@link * #allocateMemory}, the results are undefined. * - *

If the native pointer is less than 64 bits wide, it is extended as + *

If the native pointer is less than 64 bits wide, it is extended as * an unsigned number to a Java long. The pointer may be indexed by any * given byte offset, simply by adding that offset (as a simple integer) to * the long representing the pointer. The number of bytes actually read - * from the target address maybe determined by consulting {@link + * from the target address may be determined by consulting {@link * #addressSize}. * * @see #allocateMemory @@ -288,7 +285,7 @@ public final class Unsafe { * zero, or does not point into a block obtained from {@link * #allocateMemory}, the results are undefined. * - *

The number of bytes actually written at the target address maybe + *

The number of bytes actually written at the target address may be * determined by consulting {@link #addressSize}. * * @see #getAddress(long) @@ -357,7 +354,7 @@ public final class Unsafe { * (usually zero). This provides a single-register addressing mode, * as discussed in {@link #getInt(Object,long)}. * - *

Equivalent to setMemory(null, address, bytes, value). + *

Equivalent to {@code setMemory(null, address, bytes, value)}. */ public void setMemory(long address, long bytes, byte value) { setMemory(null, address, bytes, value); @@ -388,7 +385,7 @@ public final class Unsafe { * block. This provides a single-register addressing mode, * as discussed in {@link #getInt(Object,long)}. * - * Equivalent to copyMemory(null, srcAddress, null, destAddress, bytes). + * Equivalent to {@code copyMemory(null, srcAddress, null, destAddress, bytes)}. */ public void copyMemory(long srcAddress, long destAddress, long bytes) { copyMemory(null, srcAddress, null, destAddress, bytes); @@ -413,7 +410,7 @@ public final class Unsafe { public static final int INVALID_FIELD_OFFSET = -1; /** - * Report the location of a given field in the storage allocation of its + * Reports the location of a given field in the storage allocation of its * class. Do not expect to perform any sort of arithmetic on this offset; * it is just a cookie which is passed to the unsafe heap memory accessors. * @@ -433,7 +430,7 @@ public final class Unsafe { public native long objectFieldOffset(Field f); /** - * Report the location of a given static field, in conjunction with {@link + * Reports the location of a given static field, in conjunction with {@link * #staticFieldBase}. *

Do not expect to perform any sort of arithmetic on this offset; * it is just a cookie which is passed to the unsafe heap memory accessors. @@ -452,7 +449,7 @@ public final class Unsafe { public native long staticFieldOffset(Field f); /** - * Report the location of a given static field, in conjunction with {@link + * Reports the location of a given static field, in conjunction with {@link * #staticFieldOffset}. *

Fetch the base "Object", if any, with which static fields of the * given class can be accessed via methods like {@link #getInt(Object, @@ -464,7 +461,7 @@ public final class Unsafe { public native Object staticFieldBase(Field f); /** - * Detect if the given class may need to be initialized. This is often + * Detects if the given class may need to be initialized. This is often * needed in conjunction with obtaining the static field base of a * class. * @return false only if a call to {@code ensureClassInitialized} would have no effect @@ -472,14 +469,14 @@ public final class Unsafe { public native boolean shouldBeInitialized(Class c); /** - * Ensure the given class has been initialized. This is often + * Ensures the given class has been initialized. This is often * needed in conjunction with obtaining the static field base of a * class. */ public native void ensureClassInitialized(Class c); /** - * Report the offset of the first element in the storage allocation of a + * Reports the offset of the first element in the storage allocation of a * given array class. If {@link #arrayIndexScale} returns a non-zero value * for the same class, you may use that scale factor, together with this * base offset, to form new offsets to access elements of arrays of the @@ -527,7 +524,7 @@ public final class Unsafe { = theUnsafe.arrayBaseOffset(Object[].class); /** - * Report the scale factor for addressing elements in the storage + * Reports the scale factor for addressing elements in the storage * allocation of a given array class. However, arrays of "narrow" types * will generally not work properly with accessors like {@link * #getByte(Object, long)}, so the scale factor for such classes is reported @@ -576,7 +573,7 @@ public final class Unsafe { = theUnsafe.arrayIndexScale(Object[].class); /** - * Report the size in bytes of a native pointer, as stored via {@link + * Reports the size in bytes of a native pointer, as stored via {@link * #putAddress}. This value will be either 4 or 8. Note that the sizes of * other primitive types (as stored in native memory blocks) is determined * fully by their information content. @@ -587,7 +584,7 @@ public final class Unsafe { public static final int ADDRESS_SIZE = theUnsafe.addressSize(); /** - * Report the size in bytes of a native memory page (whatever that is). + * Reports the size in bytes of a native memory page (whatever that is). * This value will always be a power of two. */ public native int pageSize(); @@ -596,7 +593,7 @@ public final class Unsafe { /// random trusted operations from JNI: /** - * Tell the VM to define a class, without security checks. By default, the + * Tells the VM to define a class, without security checks. By default, the * class loader and protection domain come from the caller's class. */ public native Class defineClass(String name, byte[] b, int off, int len, @@ -604,7 +601,7 @@ public final class Unsafe { ProtectionDomain protectionDomain); /** - * Define a class but do not make it known to the class loader or system dictionary. + * Defines a class but does not make it known to the class loader or system dictionary. *

* For each CP entry, the corresponding CP patch must either be null or have * the a format that matches its tag: @@ -621,38 +618,38 @@ public final class Unsafe { */ public native Class defineAnonymousClass(Class hostClass, byte[] data, Object[] cpPatches); - - /** Allocate an instance but do not run any constructor. - Initializes the class if it has not yet been. */ + /** + * Allocates an instance but does not run any constructor. + * Initializes the class if it has not yet been. + */ public native Object allocateInstance(Class cls) throws InstantiationException; - /** Throw the exception without telling the verifier. */ + /** Throws the exception without telling the verifier. */ public native void throwException(Throwable ee); - /** - * Atomically update Java variable to x if it is currently - * holding expected. - * @return true if successful + * Atomically updates Java variable to {@code x} if it is currently + * holding {@code expected}. + * @return {@code true} if successful */ public final native boolean compareAndSwapObject(Object o, long offset, Object expected, Object x); /** - * Atomically update Java variable to x if it is currently - * holding expected. - * @return true if successful + * Atomically updates Java variable to {@code x} if it is currently + * holding {@code expected}. + * @return {@code true} if successful */ public final native boolean compareAndSwapInt(Object o, long offset, int expected, int x); /** - * Atomically update Java variable to x if it is currently - * holding expected. - * @return true if successful + * Atomically updates Java variable to {@code x} if it is currently + * holding {@code expected}. + * @return {@code true} if successful */ public final native boolean compareAndSwapLong(Object o, long offset, long expected, @@ -736,28 +733,28 @@ public final class Unsafe { public native void putOrderedLong(Object o, long offset, long x); /** - * Unblock the given thread blocked on park, or, if it is - * not blocked, cause the subsequent call to park not to + * Unblocks the given thread blocked on {@code park}, or, if it is + * not blocked, causes the subsequent call to {@code park} not to * block. Note: this operation is "unsafe" solely because the * caller must somehow ensure that the thread has not been * destroyed. Nothing special is usually required to ensure this * when called from Java (in which there will ordinarily be a live * reference to the thread) but this is not nearly-automatically * so when calling from native code. - * @param thread the thread to unpark. * + * @param thread the thread to unpark. */ public native void unpark(Object thread); /** - * Block current thread, returning when a balancing - * unpark occurs, or a balancing unpark has + * Blocks current thread, returning when a balancing + * {@code unpark} occurs, or a balancing {@code unpark} has * already occurred, or the thread is interrupted, or, if not * absolute and time is not zero, the given time nanoseconds have * elapsed, or if absolute, the given deadline in milliseconds * since Epoch has passed, or spuriously (i.e., returning for no * "reason"). Note: This operation is in the Unsafe class only - * because unpark is, so it would be strange to place it + * because {@code unpark} is, so it would be strange to place it * elsewhere. */ public native void park(boolean isAbsolute, long time); @@ -765,8 +762,8 @@ public final class Unsafe { /** * Gets the load average in the system run queue assigned * to the available processors averaged over various periods of time. - * This method retrieves the given nelem samples and - * assigns to the elements of the given loadavg array. + * This method retrieves the given {@code nelem} samples and + * assigns to the elements of the given {@code loadavg} array. * The system imposes a maximum of 3 samples, representing * averages over the last 1, 5, and 15 minutes, respectively. * @@ -784,8 +781,8 @@ public final class Unsafe { /** * Atomically adds the given value to the current value of a field - * or array element within the given object o - * at the given offset. + * or array element within the given object {@code o} + * at the given {@code offset}. * * @param o object/array to update the field/element in * @param offset field/element offset @@ -803,8 +800,8 @@ public final class Unsafe { /** * Atomically adds the given value to the current value of a field - * or array element within the given object o - * at the given offset. + * or array element within the given object {@code o} + * at the given {@code offset}. * * @param o object/array to update the field/element in * @param offset field/element offset @@ -822,8 +819,8 @@ public final class Unsafe { /** * Atomically exchanges the given value with the current value of - * a field or array element within the given object o - * at the given offset. + * a field or array element within the given object {@code o} + * at the given {@code offset}. * * @param o object/array to update the field/element in * @param offset field/element offset @@ -841,8 +838,8 @@ public final class Unsafe { /** * Atomically exchanges the given value with the current value of - * a field or array element within the given object o - * at the given offset. + * a field or array element within the given object {@code o} + * at the given {@code offset}. * * @param o object/array to update the field/element in * @param offset field/element offset @@ -861,7 +858,7 @@ public final class Unsafe { /** * Atomically exchanges the given reference value with the current * reference value of a field or array element within the given - * object o at the given offset. + * object {@code o} at the given {@code offset}. * * @param o object/array to update the field/element in * @param offset field/element offset From 0d022c42c9d3cfa4a0be4eff49309fd132496cbc Mon Sep 17 00:00:00 2001 From: Martin Buchholz Date: Tue, 10 Mar 2015 14:23:03 -0700 Subject: [PATCH 20/97] 8074579: Use more efficient and readable way of checking PKZIP signatures Reviewed-by: sherman --- .../share/native/libjli/manifest_info.h | 15 +++++++++------ .../share/native/libjli/parse_manifest.c | 17 +++++++---------- .../java.base/share/native/libzip/zip_util.c | 13 +++++-------- .../java.base/share/native/libzip/zip_util.h | 15 ++++++++------- jdk/src/java.base/unix/native/launcher/jexec.c | 2 +- 5 files changed, 30 insertions(+), 32 deletions(-) diff --git a/jdk/src/java.base/share/native/libjli/manifest_info.h b/jdk/src/java.base/share/native/libjli/manifest_info.h index cd951d5cb9f..5f9773e0bca 100644 --- a/jdk/src/java.base/share/native/libjli/manifest_info.h +++ b/jdk/src/java.base/share/native/libjli/manifest_info.h @@ -32,13 +32,16 @@ * Zip file header signatures */ #define SIGSIZ 4 /* size of all header signatures */ -#define LOCSIG 0x04034b50L /* "PK\003\004" */ -#define EXTSIG 0x08074b50L /* "PK\007\008" */ -#define CENSIG 0x02014b50L /* "PK\001\002" */ -#define ENDSIG 0x06054b50L /* "PK\005\006" */ -#define ZIP64_ENDSIG 0x06064b50L /* "PK\006\006" */ -#define ZIP64_LOCSIG 0x07064b50L /* "PK\006\007" */ +#define PKZIP_SIGNATURE_AT(p, b2, b3) \ + (((p)[0] == 'P') & ((p)[1] == 'K') & ((p)[2] == b2) & ((p)[3] == b3)) +#define CENSIG_AT(p) PKZIP_SIGNATURE_AT(p, 1, 2) +#define LOCSIG_AT(p) PKZIP_SIGNATURE_AT(p, 3, 4) +#define ENDSIG_AT(p) PKZIP_SIGNATURE_AT(p, 5, 6) +#define EXTSIG_AT(p) PKZIP_SIGNATURE_AT(p, 7, 8) +#define ZIP64_ENDSIG_AT(p) PKZIP_SIGNATURE_AT(p, 6, 6) +#define ZIP64_LOCSIG_AT(p) PKZIP_SIGNATURE_AT(p, 6, 7) + /* * Header sizes including signatures */ diff --git a/jdk/src/java.base/share/native/libjli/parse_manifest.c b/jdk/src/java.base/share/native/libjli/parse_manifest.c index a8e17b89b25..9ce82c1a1d6 100644 --- a/jdk/src/java.base/share/native/libjli/parse_manifest.c +++ b/jdk/src/java.base/share/native/libjli/parse_manifest.c @@ -138,7 +138,7 @@ find_end64(int fd, Byte *ep, jlong pos) return -1; if ((bytes = read(fd, ep, ZIP64_LOCHDR)) < 0) return -1; - if (GETSIG(ep) == ZIP64_LOCSIG) + if (ZIP64_LOCSIG_AT(ep)) return end64pos; return -1; } @@ -176,7 +176,7 @@ find_end(int fd, Byte *eb) return (-1); if ((bytes = read(fd, eb, ENDHDR)) < 0) return (-1); - if (GETSIG(eb) == ENDSIG) { + if (ENDSIG_AT(eb)) { return haveZIP64(eb) ? find_end64(fd, eb, pos) : pos; } @@ -200,14 +200,11 @@ find_end(int fd, Byte *eb) /* * Search backwards from the end of file stopping when the END header - * signature is found. (The first condition of the "if" is just a - * fast fail, because the GETSIG macro isn't always cheap. The - * final condition protects against false positives.) + * signature is found. */ endpos = &buffer[bytes]; for (cp = &buffer[bytes - ENDHDR]; cp >= &buffer[0]; cp--) - if ((*cp == (ENDSIG & 0xFF)) && (GETSIG(cp) == ENDSIG) && - (cp + ENDHDR + ENDCOM(cp) == endpos)) { + if (ENDSIG_AT(cp) && (cp + ENDHDR + ENDCOM(cp) == endpos)) { (void) memcpy(eb, cp, ENDHDR); free(buffer); pos = flen - (endpos - cp); @@ -267,7 +264,7 @@ compute_cen(int fd, Byte *bp) if ((bytes = read(fd, buffer, MINREAD)) < 0) { return (-1); } - if (GETSIG(buffer) != ZIP64_ENDSIG) { + if (!ZIP64_ENDSIG_AT(buffer)) { return -1; } if ((offset = ZIP64_ENDOFF(buffer)) < (jlong)0) { @@ -356,7 +353,7 @@ find_file(int fd, zentry *entry, const char *file_name) * Loop through the Central Directory Headers. Note that a valid zip/jar * must have an ENDHDR (with ENDSIG) after the Central Directory. */ - while (GETSIG(p) == CENSIG) { + while (CENSIG_AT(p)) { /* * If a complete header isn't in the buffer, shift the contents @@ -403,7 +400,7 @@ find_file(int fd, zentry *entry, const char *file_name) free(buffer); return (-1); } - if (GETSIG(locbuf) != LOCSIG) { + if (!LOCSIG_AT(locbuf)) { free(buffer); return (-1); } diff --git a/jdk/src/java.base/share/native/libzip/zip_util.c b/jdk/src/java.base/share/native/libzip/zip_util.c index 51ee1d5276f..d99a5cd66a7 100644 --- a/jdk/src/java.base/share/native/libzip/zip_util.c +++ b/jdk/src/java.base/share/native/libzip/zip_util.c @@ -281,9 +281,9 @@ static jboolean verifyEND(jzfile *zip, jlong endpos, char *endbuf) { return (cenpos >= 0 && locpos >= 0 && readFullyAt(zip->zfd, buf, sizeof(buf), cenpos) != -1 && - GETSIG(buf) == CENSIG && + CENSIG_AT(buf) && readFullyAt(zip->zfd, buf, sizeof(buf), locpos) != -1 && - GETSIG(buf) == LOCSIG); + LOCSIG_AT(buf)); } /* @@ -674,7 +674,7 @@ readCEN(jzfile *zip, jint knownTotal) method = CENHOW(cp); nlen = CENNAM(cp); - if (GETSIG(cp) != CENSIG) + if (!CENSIG_AT(cp)) ZIP_FORMAT_ERROR("invalid CEN header (bad signature)"); if (CENFLG(cp) & 1) ZIP_FORMAT_ERROR("invalid CEN header (encrypted entry)"); @@ -827,10 +827,7 @@ ZIP_Put_In_Cache0(const char *name, ZFILE zfd, char **pmsg, jlong lastModified, // Assumption, zfd refers to start of file. Trivially, reuse errbuf. if (readFully(zfd, errbuf, 4) != -1) { // errors will be handled later - if (GETSIG(errbuf) == LOCSIG) - zip->locsig = JNI_TRUE; - else - zip->locsig = JNI_FALSE; + zip->locsig = LOCSIG_AT(errbuf) ? JNI_TRUE : JNI_FALSE; } len = zip->len = IO_Lseek(zfd, 0, SEEK_END); @@ -1284,7 +1281,7 @@ ZIP_GetEntryDataOffset(jzfile *zip, jzentry *entry) zip->msg = "error reading zip file"; return -1; } - if (GETSIG(loc) != LOCSIG) { + if (!LOCSIG_AT(loc)) { zip->msg = "invalid LOC header (bad signature)"; return -1; } diff --git a/jdk/src/java.base/share/native/libzip/zip_util.h b/jdk/src/java.base/share/native/libzip/zip_util.h index 1287d3aa29e..1f5f3bd6cab 100644 --- a/jdk/src/java.base/share/native/libzip/zip_util.h +++ b/jdk/src/java.base/share/native/libzip/zip_util.h @@ -33,13 +33,14 @@ /* * Header signatures */ -#define LOCSIG 0x04034b50L /* "PK\003\004" */ -#define EXTSIG 0x08074b50L /* "PK\007\008" */ -#define CENSIG 0x02014b50L /* "PK\001\002" */ -#define ENDSIG 0x06054b50L /* "PK\005\006" */ - -#define ZIP64_ENDSIG 0x06064b50L /* "PK\006\006" */ -#define ZIP64_LOCSIG 0x07064b50L /* "PK\006\007" */ +#define PKZIP_SIGNATURE_AT(p, b2, b3) \ + (((p)[0] == 'P') & ((p)[1] == 'K') & ((p)[2] == b2) & ((p)[3] == b3)) +#define CENSIG_AT(p) PKZIP_SIGNATURE_AT(p, 1, 2) +#define LOCSIG_AT(p) PKZIP_SIGNATURE_AT(p, 3, 4) +#define ENDSIG_AT(p) PKZIP_SIGNATURE_AT(p, 5, 6) +#define EXTSIG_AT(p) PKZIP_SIGNATURE_AT(p, 7, 8) +#define ZIP64_ENDSIG_AT(p) PKZIP_SIGNATURE_AT(p, 6, 6) +#define ZIP64_LOCSIG_AT(p) PKZIP_SIGNATURE_AT(p, 6, 7) /* * Header sizes including signatures diff --git a/jdk/src/java.base/unix/native/launcher/jexec.c b/jdk/src/java.base/unix/native/launcher/jexec.c index a30617de7b9..179ae4f893c 100644 --- a/jdk/src/java.base/unix/native/launcher/jexec.c +++ b/jdk/src/java.base/unix/native/launcher/jexec.c @@ -323,7 +323,7 @@ const char * isJar(const char * path) { result = BAD_MAGIC_MSG; // be sure the file is at least a ZIP file - if (GETSIG(buf) == LOCSIG) { + if (LOCSIG_AT(buf)) { off_t flen = LOCNAM(buf); off_t xlen = LOCEXT(buf); From 665dc6f6279ac6d253a18190e71a1bc5545b5509 Mon Sep 17 00:00:00 2001 From: Xue-Lei Andrew Fan Date: Wed, 11 Mar 2015 04:52:39 +0000 Subject: [PATCH 21/97] 8072385: Only the first DNSName entry is checked for endpoint identification Reviewed-by: weijun, jnimeh --- .../share/classes/sun/security/ssl/ClientHandshaker.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java b/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java index 7f1577beb83..cb4f54eb125 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java @@ -1569,6 +1569,9 @@ final class ClientHandshaker extends Handshaker { /* * Returns the subject alternative name of the specified type in the * subjectAltNames extension of a certificate. + * + * Note that only those subjectAltName types that use String data + * should be passed into this function. */ private static Collection getSubjectAltNames( Collection> subjectAltNames, int type) { From 6a297b5c2bafe626e5e28b81fb59775b5932e975 Mon Sep 17 00:00:00 2001 From: Masayoshi Okutsu Date: Wed, 11 Mar 2015 14:33:14 +0900 Subject: [PATCH 22/97] 8074791: Long-form date format incorrect month string for Finnish locale Reviewed-by: naoto --- .../sun/text/resources/fi/FormatData_fi.java | 6 +- .../sun/text/resources/Format/Bug8074791.java | 69 +++++++++++++++++++ jdk/test/sun/text/resources/LocaleData | 6 ++ .../sun/text/resources/LocaleDataTest.java | 4 +- 4 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 jdk/test/sun/text/resources/Format/Bug8074791.java diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/fi/FormatData_fi.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/fi/FormatData_fi.java index f80df887abf..c9a520a8388 100644 --- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/fi/FormatData_fi.java +++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/fi/FormatData_fi.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -295,8 +295,8 @@ public class FormatData_fi extends ParallelListResourceBundle { }, { "DatePatterns", new String[] { - "d. MMMM'ta 'yyyy", // full date pattern - "d. MMMM'ta 'yyyy", // long date pattern + "d. MMMM yyyy", // full date pattern + "d. MMMM yyyy", // long date pattern "d.M.yyyy", // medium date pattern "d.M.yyyy", // short date pattern } diff --git a/jdk/test/sun/text/resources/Format/Bug8074791.java b/jdk/test/sun/text/resources/Format/Bug8074791.java new file mode 100644 index 00000000000..138158ca090 --- /dev/null +++ b/jdk/test/sun/text/resources/Format/Bug8074791.java @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8074791 + * @summary Make sure that Finnish month names are correct in formatted text. + */ + +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.Locale; +import static java.text.DateFormat.*; +import static java.util.Calendar.JANUARY; + +public class Bug8074791 { + private static Locale FINNISH = new Locale("fi"); + private static String JAN_FORMAT = "tammikuuta"; + private static String JAN_STANDALONE = "tammikuu"; + + public static void main(String[] arg) { + int errors = 0; + + DateFormat df = DateFormat.getDateInstance(LONG, FINNISH); + Date jan20 = new GregorianCalendar(2015, JANUARY, 20).getTime(); + String str = df.format(jan20).toString(); + // Extract the month name (locale data dependent) + String month = str.replaceAll(".+\\s([a-z]+)\\s\\d+$", "$1"); + if (!month.equals(JAN_FORMAT)) { + errors++; + System.err.println("wrong format month name: got '" + month + + "', expected '" + JAN_FORMAT + "'"); + } + + SimpleDateFormat sdf = new SimpleDateFormat("LLLL", FINNISH); // stand-alone month name + month = sdf.format(jan20); + if (!month.equals(JAN_STANDALONE)) { + errors++; + System.err.println("wrong stand-alone month name: got '" + month + + "', expected '" + JAN_STANDALONE + "'"); + } + + if (errors > 0) { + throw new RuntimeException(); + } + } +} diff --git a/jdk/test/sun/text/resources/LocaleData b/jdk/test/sun/text/resources/LocaleData index 205932144d3..719cc3df066 100644 --- a/jdk/test/sun/text/resources/LocaleData +++ b/jdk/test/sun/text/resources/LocaleData @@ -8273,3 +8273,9 @@ FormatData/zh/MonthNarrows/9=10 FormatData/zh/MonthNarrows/10=11 FormatData/zh/MonthNarrows/11=12 FormatData/zh/MonthNarrows/12= + +# bug #8074791 +FormatData/fi/DatePatterns/0=d. MMMM yyyy +FormatData/fi/DatePatterns/1=d. MMMM yyyy +FormatData/fi/DatePatterns/2=d.M.yyyy +FormatData/fi/DatePatterns/3=d.M.yyyy diff --git a/jdk/test/sun/text/resources/LocaleDataTest.java b/jdk/test/sun/text/resources/LocaleDataTest.java index abfdd97943d..96d6d1d9a75 100644 --- a/jdk/test/sun/text/resources/LocaleDataTest.java +++ b/jdk/test/sun/text/resources/LocaleDataTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -36,7 +36,7 @@ * 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495 * 7003124 7085757 7028073 7171028 7189611 8000983 7195759 8004489 8006509 * 7114053 7074882 7040556 8013836 8021121 6192407 6931564 8027695 8017142 - * 8037343 8055222 8042126 + * 8037343 8055222 8042126 8074791 * @summary Verify locale data * */ From e8b15600ac394449663c4a1f4c6a955746640c5f Mon Sep 17 00:00:00 2001 From: Staffan Larsen Date: Wed, 11 Mar 2015 08:09:35 +0100 Subject: [PATCH 23/97] 8074841: Resolve disabled warnings for the JVMTI demo compiledMethodLoad 8074842: Resolve disabled warnings for the JVMTI demo waiters Reviewed-by: alanb, ihse, dsamersoff --- jdk/make/CompileDemos.gmk | 4 ++-- .../demo/share/jvmti/compiledMethodLoad/compiledMethodLoad.c | 2 +- jdk/src/demo/share/jvmti/waiters/Agent.cpp | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/jdk/make/CompileDemos.gmk b/jdk/make/CompileDemos.gmk index a56b020e09d..2d10867948f 100644 --- a/jdk/make/CompileDemos.gmk +++ b/jdk/make/CompileDemos.gmk @@ -316,13 +316,13 @@ define SetupJVMTIDemo endif endef -$(eval $(call SetupJVMTIDemo,compiledMethodLoad, agent_util, , , , , , , , pointer-to-int-cast format, , format)) +$(eval $(call SetupJVMTIDemo,compiledMethodLoad, agent_util)) $(eval $(call SetupJVMTIDemo,gctest, agent_util)) $(eval $(call SetupJVMTIDemo,heapTracker, agent_util java_crw_demo)) $(eval $(call SetupJVMTIDemo,heapViewer, agent_util)) $(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo)) $(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo)) -$(eval $(call SetupJVMTIDemo,waiters, agent_util, , C++, , , , , , , 4101)) +$(eval $(call SetupJVMTIDemo,waiters, agent_util, , C++)) $(eval $(call SetupJVMTIDemo,versionCheck, agent_util)) ################################################################################################## diff --git a/jdk/src/demo/share/jvmti/compiledMethodLoad/compiledMethodLoad.c b/jdk/src/demo/share/jvmti/compiledMethodLoad/compiledMethodLoad.c index 0f78bc953f7..72c9717a5cb 100644 --- a/jdk/src/demo/share/jvmti/compiledMethodLoad/compiledMethodLoad.c +++ b/jdk/src/demo/share/jvmti/compiledMethodLoad/compiledMethodLoad.c @@ -143,7 +143,7 @@ print_inline_info_record(jvmtiCompiledMethodLoadInlineRecord* record, for (i = 0; i < numpcs; i++) { PCStackInfo pcrecord = (record->pcinfo[i]); - fprintf(fp, "PcDescriptor(pc=0x%lx):\n", (jint)(pcrecord.pc)); + fprintf(fp, "PcDescriptor(pc=%p):\n", pcrecord.pc); print_stack_frames(&pcrecord, jvmti, fp); } } diff --git a/jdk/src/demo/share/jvmti/waiters/Agent.cpp b/jdk/src/demo/share/jvmti/waiters/Agent.cpp index cf2285c6ca6..8f67f5480a5 100644 --- a/jdk/src/demo/share/jvmti/waiters/Agent.cpp +++ b/jdk/src/demo/share/jvmti/waiters/Agent.cpp @@ -111,8 +111,6 @@ Agent::get_monitor(jvmtiEnv *jvmti, JNIEnv *env, jobject object) /* VM initialization and VM death calls to Agent */ Agent::Agent(jvmtiEnv *jvmti, JNIEnv *env, jthread thread) { - jvmtiError err; - stdout_message("Agent created..\n"); stdout_message("VMInit...\n"); /* Start monitor list */ @@ -129,8 +127,6 @@ Agent::~Agent() void Agent::vm_death(jvmtiEnv *jvmti, JNIEnv *env) { - jvmtiError err; - /* Delete all Monitors we allocated */ for ( int i = 0; i < (int)monitor_count; i++ ) { delete monitor_list[i]; From d7388dd061807da09fb53cdfc34aab4bd9d2e766 Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Wed, 11 Mar 2015 08:33:12 -0700 Subject: [PATCH 24/97] 8074993: policytool launcher missing Reviewed-by: weijun --- jdk/make/launcher/Launcher-jdk.policytool.gmk | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 jdk/make/launcher/Launcher-jdk.policytool.gmk diff --git a/jdk/make/launcher/Launcher-jdk.policytool.gmk b/jdk/make/launcher/Launcher-jdk.policytool.gmk new file mode 100644 index 00000000000..133e3f612d8 --- /dev/null +++ b/jdk/make/launcher/Launcher-jdk.policytool.gmk @@ -0,0 +1,32 @@ +# +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include LauncherCommon.gmk + +ifndef BUILD_HEADLESS_ONLY + $(eval $(call SetupLauncher,policytool, \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.policytool.PolicyTool"$(COMMA) }',, \ + $(XLIBS))) +endif From acb7e7eccd80308a2727475744bdc931f2f3b304 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Thu, 12 Mar 2015 12:13:48 +0100 Subject: [PATCH 25/97] 8074988: Reduce boilerplate in Setup* macro definitions Reviewed-by: tbell, ihse --- jdk/make/gendata/GendataPolicyJars.gmk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jdk/make/gendata/GendataPolicyJars.gmk b/jdk/make/gendata/GendataPolicyJars.gmk index 9364159f129..256b32e2b58 100644 --- a/jdk/make/gendata/GendataPolicyJars.gmk +++ b/jdk/make/gendata/GendataPolicyJars.gmk @@ -77,7 +77,7 @@ US_EXPORT_POLICY_JAR_DEPS := \ $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy $(eval $(call SetupArchive,BUILD_US_EXPORT_POLICY_JAR, \ - $(US_EXPORT_POLICY_JAR_DEPS), \ + DEPENDENCIES := $(US_EXPORT_POLICY_JAR_DEPS), \ SRCS := $(US_EXPORT_POLICY_JAR_TMP), \ SUFFIXES := .policy, \ JAR := $(US_EXPORT_POLICY_JAR_UNLIMITED), \ @@ -139,8 +139,8 @@ $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/%: \ $(install-file) $(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR_LIMITED, \ - $(LOCAL_POLICY_JAR_LIMITED_TMP)/exempt_local.policy \ - $(LOCAL_POLICY_JAR_LIMITED_TMP)/default_local.policy, \ + DEPENDENCIES := $(LOCAL_POLICY_JAR_LIMITED_TMP)/exempt_local.policy \ + $(LOCAL_POLICY_JAR_LIMITED_TMP)/default_local.policy, \ SRCS := $(LOCAL_POLICY_JAR_LIMITED_TMP), \ SUFFIXES := .policy, \ JAR := $(LOCAL_POLICY_JAR_LIMITED), \ @@ -148,7 +148,7 @@ $(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR_LIMITED, \ SKIP_METAINF := true)) $(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR_UNLIMITED, \ - $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/default_local.policy, \ + DEPENDENCIES := $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/default_local.policy, \ SRCS := $(LOCAL_POLICY_JAR_UNLIMITED_TMP), \ SUFFIXES := .policy, \ JAR := $(LOCAL_POLICY_JAR_UNLIMITED), \ From e7472cc455aaa732ad35d185c76e0f7ef379a223 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Thu, 12 Mar 2015 16:25:24 +0100 Subject: [PATCH 26/97] 8074796: Disabling warnings on clang triggers compiler bug for libunpack Reviewed-by: erikj --- jdk/make/lib/Lib-jdk.pack200.gmk | 1 - 1 file changed, 1 deletion(-) diff --git a/jdk/make/lib/Lib-jdk.pack200.gmk b/jdk/make/lib/Lib-jdk.pack200.gmk index 37e32d0a725..b8bab611310 100644 --- a/jdk/make/lib/Lib-jdk.pack200.gmk +++ b/jdk/make/lib/Lib-jdk.pack200.gmk @@ -42,7 +42,6 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK, \ CFLAGS_release := -DPRODUCT, \ DISABLED_WARNINGS_gcc := conversion-null sign-compare format-security \ format-nonliteral parentheses, \ - DISABLED_WARNINGS_clang := bool-conversion format-security, \ DISABLED_WARNINGS_solstudio := truncwarn, \ DISABLED_WARNINGS_microsoft := 4267 4018, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers, \ From 55f8f159ca01b6cb0eb288fd0f94528f15addae9 Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Thu, 12 Mar 2015 09:39:48 -0700 Subject: [PATCH 27/97] 8075034: Bad javadoc tags in javax.xml.crypto.dsig Reviewed-by: mullan --- .../share/classes/javax/xml/crypto/dsig/Manifest.java | 2 +- .../share/classes/javax/xml/crypto/dsig/XMLObject.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Manifest.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Manifest.java index 351b3a9a674..f1a7f16d24d 100644 --- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Manifest.java +++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Manifest.java @@ -52,7 +52,7 @@ import java.util.List; * 

  *   XMLSignatureFactory factory = XMLSignatureFactory.getInstance("DOM");
  *   Reference ref = factory.newReference("#reference-1", DigestMethod.SHA1);
- *   List references = Collections.singletonList(ref);
+ *   List<Reference> references = Collections.singletonList(ref);
  *   Manifest manifest = factory.newManifest(references, "manifest-1");
  *
* diff --git a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLObject.java b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLObject.java index 572be86f207..4117c8b1901 100644 --- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLObject.java +++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLObject.java @@ -65,7 +65,7 @@ import javax.xml.crypto.XMLStructure; * 
  *   XMLSignatureFactory fac = XMLSignatureFactory.getInstance("DOM");
  *   Manifest manifest = fac.newManifest(references);
- *   List content = Collections.singletonList(manifest);
+ *   List<XMLStructure> content = Collections.singletonList(manifest);
  *   XMLObject object = factory.newXMLObject(content, "object-1", null, null);
  *
* From 68ef8f60358ff88311655c87781f71db7dc68bb1 Mon Sep 17 00:00:00 2001 From: Brian Burkhalter Date: Thu, 12 Feb 2015 12:56:48 -0800 Subject: [PATCH 28/97] 8068373: (prefs) FileSystemPreferences writes \0 to XML storage, causing loss of all preferences Disallow entries whose key or value contains the null control character '\u0000' from being stored in the preferences node. Reviewed-by: psandoz, rriggs --- .../classes/java/util/prefs/Preferences.java | 4 +- .../util/prefs/FileSystemPreferences.java | 14 ++- .../util/prefs/CodePointZeroPrefsTest.java | 89 +++++++++++++++++++ 3 files changed, 105 insertions(+), 2 deletions(-) create mode 100644 jdk/test/java/util/prefs/CodePointZeroPrefsTest.java diff --git a/jdk/src/java.prefs/share/classes/java/util/prefs/Preferences.java b/jdk/src/java.prefs/share/classes/java/util/prefs/Preferences.java index 3b7b47f30cf..beb0b0fa1a9 100644 --- a/jdk/src/java.prefs/share/classes/java/util/prefs/Preferences.java +++ b/jdk/src/java.prefs/share/classes/java/util/prefs/Preferences.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -489,6 +489,8 @@ public abstract class Preferences { * MAX_VALUE_LENGTH. * @throws IllegalStateException if this node (or an ancestor) has been * removed with the {@link #removeNode()} method. + * @throws IllegalArgumentException if either the key or the value contain + * the null control character, code point U+0000. */ public abstract void put(String key, String value); diff --git a/jdk/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java b/jdk/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java index ebbca48a255..7bcd1d3ad24 100644 --- a/jdk/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java +++ b/jdk/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -49,6 +49,13 @@ import sun.util.logging.PlatformLogger; */ class FileSystemPreferences extends AbstractPreferences { + /** + * The code point U+0000, assigned to the null control character, is the + * only character encoded in Unicode and ISO/IEC 10646 that is always + * invalid in any XML 1.0 and 1.1 document. + */ + private static final String CODE_POINT_U0000 = String.valueOf('\u0000'); + static { PrivilegedAction load = () -> { System.loadLibrary("prefs"); @@ -525,6 +532,11 @@ class FileSystemPreferences extends AbstractPreferences { } protected void putSpi(String key, String value) { + if (key.indexOf(CODE_POINT_U0000) != -1) { + throw new IllegalArgumentException("Key contains code point U+0000"); + } else if (value.indexOf(CODE_POINT_U0000) != -1) { + throw new IllegalArgumentException("Value contains code point U+0000"); + } initCacheIfNecessary(); changeLog.add(new Put(key, value)); prefsCache.put(key, value); diff --git a/jdk/test/java/util/prefs/CodePointZeroPrefsTest.java b/jdk/test/java/util/prefs/CodePointZeroPrefsTest.java new file mode 100644 index 00000000000..8a63b86caf9 --- /dev/null +++ b/jdk/test/java/util/prefs/CodePointZeroPrefsTest.java @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +import java.lang.reflect.Constructor; +import java.util.prefs.Preferences; +import java.util.prefs.PreferencesFactory; + +/* + * @test + * @bug 8068373 + * @summary Ensure writing a code point U+0000 null control character is detected. + */ +public class CodePointZeroPrefsTest +{ + public static void main(String[] args) throws Exception + { + int failures = 0; + + // Deliberately reflect so you can reproduce it on any platform. + Constructor constructor = + Class.forName("java.util.prefs.FileSystemPreferencesFactory").asSubclass(PreferencesFactory.class).getDeclaredConstructor(); + constructor.setAccessible(true); + PreferencesFactory factory = constructor.newInstance(); + + Preferences node = factory.userRoot().node("com/acme/testing"); + + // legal key and value + try { + node.put("a", "1"); + } catch (IllegalArgumentException iae) { + System.err.println("Unexpected IllegalArgumentException for legal key"); + failures++; + } + + // illegal key only + int numIAEs = 0; + try { + node.put("a\u0000b", "1"); + System.err.println("IllegalArgumentException not thrown for illegal key"); + failures++; + } catch (IllegalArgumentException iae) { + // do nothing + } + + // illegal value only + numIAEs = 0; + try { + node.put("ab", "2\u00003"); + System.err.println("IllegalArgumentException not thrown for illegal value"); + failures++; + } catch (IllegalArgumentException iae) { + // do nothing + } + + // illegal key and value + numIAEs = 0; + try { + node.put("a\u0000b", "2\u00003"); + System.err.println("IllegalArgumentException not thrown for illegal entry"); + failures++; + } catch (IllegalArgumentException iae) { + // do nothing + } + + if (failures != 0) { + throw new RuntimeException("CodePointZeroPrefsTest failed with " + + failures + " errors!"); + } + } +} From 0596217df6259801c5cd11132afbdc20f94de4d4 Mon Sep 17 00:00:00 2001 From: Igor Ignatyev Date: Thu, 19 Feb 2015 23:49:22 +0300 Subject: [PATCH 29/97] 8073499: quarantine compiler/tiered/LevelTransitionTest Reviewed-by: kvn --- hotspot/test/compiler/tiered/LevelTransitionTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/test/compiler/tiered/LevelTransitionTest.java b/hotspot/test/compiler/tiered/LevelTransitionTest.java index 79d3626b9de..852060975b1 100644 --- a/hotspot/test/compiler/tiered/LevelTransitionTest.java +++ b/hotspot/test/compiler/tiered/LevelTransitionTest.java @@ -29,6 +29,7 @@ import java.util.concurrent.Callable; /** * @test LevelTransitionTest * @library /testlibrary /../../test/lib /compiler/whitebox + * @ignore 8067651 * @build TransitionsTestExecutor LevelTransitionTest * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=240 -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions From f8c9e34966c40ef077851962d6fea3dbd0a71856 Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Wed, 18 Feb 2015 16:19:48 +0300 Subject: [PATCH 30/97] 8067157: Closed compiler tests should not be in hotspot/test/TEST.groups Replace closed/compiler tests with sanity/ExecuteInternalVMTests.java to keep the hotspot_compiler_closed group Reviewed-by: kvn, zmajo --- hotspot/test/TEST.groups | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/hotspot/test/TEST.groups b/hotspot/test/TEST.groups index 109866e0b06..ad2983d510d 100644 --- a/hotspot/test/TEST.groups +++ b/hotspot/test/TEST.groups @@ -384,35 +384,7 @@ hotspot_compiler_3 = \ -compiler/runtime/6826736 hotspot_compiler_closed = \ - closed/compiler/c1/ \ - closed/compiler/c2/ \ - closed/compiler/codegen/ \ - closed/compiler/escapeAnalysis/ \ - closed/compiler/interpreter/ \ - closed/compiler/jsr292/ \ - closed/compiler/loopopts/ \ - closed/compiler/oracle/ \ - closed/compiler/runtime/ \ - closed/compiler/symantec/ \ - -closed/compiler/c1/4477197 \ - -closed/compiler/c1/5040872 \ - -closed/compiler/c1/6507107 \ - -closed/compiler/c2/4344895 \ - -closed/compiler/c2/4485006 \ - -closed/compiler/c2/4523683 \ - -closed/compiler/c2/4620290 \ - -closed/compiler/c2/4998314 \ - -closed/compiler/c2/6329104 \ - -closed/compiler/c2/6434117 \ - -closed/compiler/c2/6547163 \ - -closed/compiler/c2/6563987 \ - -closed/compiler/c2/6595044 \ - -closed/compiler/codegen/6440479 \ - -closed/compiler/codegen/6603011 \ - -closed/compiler/interpreter/5034475 \ - -closed/compiler/jsr292/LongLambdaFormDynamicStackDepth.java \ - -closed/compiler/loopopts/4463485 \ - -closed/compiler/loopopts/8021898 + sanity/ExecuteInternalVMTests.java hotspot_gc = \ sanity/ExecuteInternalVMTests.java \ From 55df61e264e368907f1890a1e9892af41890bfdc Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Wed, 18 Feb 2015 16:59:56 +0300 Subject: [PATCH 31/97] 8067012: Don't create MDO for constant getters Add check if the method is constant getter Reviewed-by: kvn, iveresov --- hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp b/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp index eb83161ca43..5ac9413e8d0 100644 --- a/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp +++ b/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp @@ -289,7 +289,12 @@ bool AdvancedThresholdPolicy::should_not_inline(ciEnv* env, ciMethod* callee) { // Create MDO if necessary. void AdvancedThresholdPolicy::create_mdo(methodHandle mh, JavaThread* THREAD) { - if (mh->is_native() || mh->is_abstract() || mh->is_accessor()) return; + if (mh->is_native() || + mh->is_abstract() || + mh->is_accessor() || + mh->is_constant_getter()) { + return; + } if (mh->method_data() == NULL) { Method::build_interpreter_method_data(mh, CHECK_AND_CLEAR); } From c71eca0cbf76dff7b2ebe344b30dc20bb4bb0de2 Mon Sep 17 00:00:00 2001 From: Dmitrij Pochepko Date: Thu, 19 Feb 2015 23:47:01 +0300 Subject: [PATCH 32/97] 8068461: compiler/codecache/jmx/UsageThresholdIncreasedTest.java failed: java.lang.RuntimeException: Usage threshold was hit: 1 times for CodeHeap 'non-nmethods' Added filter for invalid testcase Reviewed-by: kvn, iignatyev --- .../compiler/codecache/jmx/UsageThresholdIncreasedTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hotspot/test/compiler/codecache/jmx/UsageThresholdIncreasedTest.java b/hotspot/test/compiler/codecache/jmx/UsageThresholdIncreasedTest.java index e70f62aa4dd..276ba90bd63 100644 --- a/hotspot/test/compiler/codecache/jmx/UsageThresholdIncreasedTest.java +++ b/hotspot/test/compiler/codecache/jmx/UsageThresholdIncreasedTest.java @@ -51,7 +51,9 @@ public class UsageThresholdIncreasedTest { public static void main(String[] args) { for (BlobType btype : BlobType.getAvailable()) { - new UsageThresholdIncreasedTest(btype).runTest(); + if (CodeCacheUtils.isCodeHeapPredictable(btype)) { + new UsageThresholdIncreasedTest(btype).runTest(); + } } } From 88848bd9e8fe191b7027fe27593df752982b1801 Mon Sep 17 00:00:00 2001 From: Roland Westrelin Date: Wed, 18 Feb 2015 18:14:07 +0100 Subject: [PATCH 33/97] 6912521: System.arraycopy works slower than the simple loop for little lengths Convert small array copies to series of loads and stores Reviewed-by: kvn, vlivanov --- hotspot/src/share/vm/opto/arraycopynode.cpp | 584 +++++++++++++++++ hotspot/src/share/vm/opto/arraycopynode.hpp | 164 +++++ hotspot/src/share/vm/opto/callnode.cpp | 191 ------ hotspot/src/share/vm/opto/callnode.hpp | 113 ---- hotspot/src/share/vm/opto/classes.cpp | 1 + hotspot/src/share/vm/opto/compile.cpp | 21 + hotspot/src/share/vm/opto/compile.hpp | 3 + hotspot/src/share/vm/opto/graphKit.cpp | 17 +- hotspot/src/share/vm/opto/library_call.cpp | 52 +- hotspot/src/share/vm/opto/macroArrayCopy.cpp | 3 +- .../arraycopy/TestArrayCopyAsLoadsStores.java | 618 ++++++++++++++++++ 11 files changed, 1440 insertions(+), 327 deletions(-) create mode 100644 hotspot/src/share/vm/opto/arraycopynode.cpp create mode 100644 hotspot/src/share/vm/opto/arraycopynode.hpp create mode 100644 hotspot/test/compiler/arraycopy/TestArrayCopyAsLoadsStores.java diff --git a/hotspot/src/share/vm/opto/arraycopynode.cpp b/hotspot/src/share/vm/opto/arraycopynode.cpp new file mode 100644 index 00000000000..9c0c4d040ac --- /dev/null +++ b/hotspot/src/share/vm/opto/arraycopynode.cpp @@ -0,0 +1,584 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "opto/arraycopynode.hpp" +#include "opto/graphKit.hpp" + +ArrayCopyNode::ArrayCopyNode(Compile* C, bool alloc_tightly_coupled) + : CallNode(arraycopy_type(), NULL, TypeRawPtr::BOTTOM), + _alloc_tightly_coupled(alloc_tightly_coupled), + _kind(None), + _arguments_validated(false) { + init_class_id(Class_ArrayCopy); + init_flags(Flag_is_macro); + C->add_macro_node(this); +} + +uint ArrayCopyNode::size_of() const { return sizeof(*this); } + +ArrayCopyNode* ArrayCopyNode::make(GraphKit* kit, bool may_throw, + Node* src, Node* src_offset, + Node* dest, Node* dest_offset, + Node* length, + bool alloc_tightly_coupled, + Node* src_klass, Node* dest_klass, + Node* src_length, Node* dest_length) { + + ArrayCopyNode* ac = new ArrayCopyNode(kit->C, alloc_tightly_coupled); + Node* prev_mem = kit->set_predefined_input_for_runtime_call(ac); + + ac->init_req(ArrayCopyNode::Src, src); + ac->init_req(ArrayCopyNode::SrcPos, src_offset); + ac->init_req(ArrayCopyNode::Dest, dest); + ac->init_req(ArrayCopyNode::DestPos, dest_offset); + ac->init_req(ArrayCopyNode::Length, length); + ac->init_req(ArrayCopyNode::SrcLen, src_length); + ac->init_req(ArrayCopyNode::DestLen, dest_length); + ac->init_req(ArrayCopyNode::SrcKlass, src_klass); + ac->init_req(ArrayCopyNode::DestKlass, dest_klass); + + if (may_throw) { + ac->set_req(TypeFunc::I_O , kit->i_o()); + kit->add_safepoint_edges(ac, false); + } + + return ac; +} + +void ArrayCopyNode::connect_outputs(GraphKit* kit) { + kit->set_all_memory_call(this, true); + kit->set_control(kit->gvn().transform(new ProjNode(this,TypeFunc::Control))); + kit->set_i_o(kit->gvn().transform(new ProjNode(this, TypeFunc::I_O))); + kit->make_slow_call_ex(this, kit->env()->Throwable_klass(), true); + kit->set_all_memory_call(this); +} + +#ifndef PRODUCT +const char* ArrayCopyNode::_kind_names[] = {"arraycopy", "arraycopy, validated arguments", "clone", "oop array clone", "CopyOf", "CopyOfRange"}; +void ArrayCopyNode::dump_spec(outputStream *st) const { + CallNode::dump_spec(st); + st->print(" (%s%s)", _kind_names[_kind], _alloc_tightly_coupled ? ", tightly coupled allocation" : ""); +} +#endif + +intptr_t ArrayCopyNode::get_length_if_constant(PhaseGVN *phase) const { + // check that length is constant + Node* length = in(ArrayCopyNode::Length); + const Type* length_type = phase->type(length); + + if (length_type == Type::TOP) { + return -1; + } + + assert(is_clonebasic() || is_arraycopy() || is_copyof() || is_copyofrange(), "unexpected array copy type"); + + return is_clonebasic() ? length->find_intptr_t_con(-1) : length->find_int_con(-1); +} + +int ArrayCopyNode::get_count(PhaseGVN *phase) const { + Node* src = in(ArrayCopyNode::Src); + const Type* src_type = phase->type(src); + + if (is_clonebasic()) { + if (src_type->isa_instptr()) { + const TypeInstPtr* inst_src = src_type->is_instptr(); + ciInstanceKlass* ik = inst_src->klass()->as_instance_klass(); + // ciInstanceKlass::nof_nonstatic_fields() doesn't take injected + // fields into account. They are rare anyway so easier to simply + // skip instances with injected fields. + if ((!inst_src->klass_is_exact() && (ik->is_interface() || ik->has_subklass())) || ik->has_injected_fields()) { + return -1; + } + int nb_fields = ik->nof_nonstatic_fields(); + return nb_fields; + } else { + const TypeAryPtr* ary_src = src_type->isa_aryptr(); + assert (ary_src != NULL, "not an array or instance?"); + // clone passes a length as a rounded number of longs. If we're + // cloning an array we'll do it element by element. If the + // length input to ArrayCopyNode is constant, length of input + // array must be too. + + assert((get_length_if_constant(phase) == -1) == !ary_src->size()->is_con(), "inconsistent"); + + if (ary_src->size()->is_con()) { + return ary_src->size()->get_con(); + } + return -1; + } + } + + return get_length_if_constant(phase); +} + +Node* ArrayCopyNode::try_clone_instance(PhaseGVN *phase, bool can_reshape, int count) { + if (!is_clonebasic()) { + return NULL; + } + + Node* src = in(ArrayCopyNode::Src); + Node* dest = in(ArrayCopyNode::Dest); + Node* ctl = in(TypeFunc::Control); + Node* in_mem = in(TypeFunc::Memory); + + const Type* src_type = phase->type(src); + const Type* dest_type = phase->type(dest); + + assert(src->is_AddP(), "should be base + off"); + assert(dest->is_AddP(), "should be base + off"); + Node* base_src = src->in(AddPNode::Base); + Node* base_dest = dest->in(AddPNode::Base); + + MergeMemNode* mem = MergeMemNode::make(in_mem); + + const TypeInstPtr* inst_src = src_type->isa_instptr(); + + if (inst_src == NULL) { + return NULL; + } + + if (!inst_src->klass_is_exact()) { + ciInstanceKlass* ik = inst_src->klass()->as_instance_klass(); + assert(!ik->is_interface() && !ik->has_subklass(), "inconsistent klass hierarchy"); + phase->C->dependencies()->assert_leaf_type(ik); + } + + ciInstanceKlass* ik = inst_src->klass()->as_instance_klass(); + assert(ik->nof_nonstatic_fields() <= ArrayCopyLoadStoreMaxElem, "too many fields"); + + for (int i = 0; i < count; i++) { + ciField* field = ik->nonstatic_field_at(i); + int fieldidx = phase->C->alias_type(field)->index(); + const TypePtr* adr_type = phase->C->alias_type(field)->adr_type(); + Node* off = phase->MakeConX(field->offset()); + Node* next_src = phase->transform(new AddPNode(base_src,base_src,off)); + Node* next_dest = phase->transform(new AddPNode(base_dest,base_dest,off)); + BasicType bt = field->layout_type(); + + const Type *type; + if (bt == T_OBJECT) { + if (!field->type()->is_loaded()) { + type = TypeInstPtr::BOTTOM; + } else { + ciType* field_klass = field->type(); + type = TypeOopPtr::make_from_klass(field_klass->as_klass()); + } + } else { + type = Type::get_const_basic_type(bt); + } + + Node* v = LoadNode::make(*phase, ctl, mem->memory_at(fieldidx), next_src, adr_type, type, bt, MemNode::unordered); + v = phase->transform(v); + Node* s = StoreNode::make(*phase, ctl, mem->memory_at(fieldidx), next_dest, adr_type, v, bt, MemNode::unordered); + s = phase->transform(s); + mem->set_memory_at(fieldidx, s); + } + + if (!finish_transform(phase, can_reshape, ctl, mem)) { + return NULL; + } + + return mem; +} + +bool ArrayCopyNode::prepare_array_copy(PhaseGVN *phase, bool can_reshape, + Node*& adr_src, + Node*& base_src, + Node*& adr_dest, + Node*& base_dest, + BasicType& copy_type, + const Type*& value_type, + bool& disjoint_bases) { + Node* src = in(ArrayCopyNode::Src); + Node* dest = in(ArrayCopyNode::Dest); + const Type* src_type = phase->type(src); + const TypeAryPtr* ary_src = src_type->isa_aryptr(); + + if (is_arraycopy() || is_copyofrange() || is_copyof()) { + const Type* dest_type = phase->type(dest); + const TypeAryPtr* ary_dest = dest_type->isa_aryptr(); + Node* src_offset = in(ArrayCopyNode::SrcPos); + Node* dest_offset = in(ArrayCopyNode::DestPos); + + // newly allocated object is guaranteed to not overlap with source object + disjoint_bases = is_alloc_tightly_coupled(); + + if (ary_src == NULL || ary_src->klass() == NULL || + ary_dest == NULL || ary_dest->klass() == NULL) { + // We don't know if arguments are arrays + return false; + } + + BasicType src_elem = ary_src->klass()->as_array_klass()->element_type()->basic_type(); + BasicType dest_elem = ary_dest->klass()->as_array_klass()->element_type()->basic_type(); + if (src_elem == T_ARRAY) src_elem = T_OBJECT; + if (dest_elem == T_ARRAY) dest_elem = T_OBJECT; + + if (src_elem != dest_elem || dest_elem == T_VOID) { + // We don't know if arguments are arrays of the same type + return false; + } + + if (dest_elem == T_OBJECT && (!is_alloc_tightly_coupled() || !GraphKit::use_ReduceInitialCardMarks())) { + // It's an object array copy but we can't emit the card marking + // that is needed + return false; + } + + value_type = ary_src->elem(); + + base_src = src; + base_dest = dest; + + uint shift = exact_log2(type2aelembytes(dest_elem)); + uint header = arrayOopDesc::base_offset_in_bytes(dest_elem); + + adr_src = src; + adr_dest = dest; + + src_offset = Compile::conv_I2X_index(phase, src_offset, ary_src->size()); + dest_offset = Compile::conv_I2X_index(phase, dest_offset, ary_dest->size()); + + Node* src_scale = phase->transform(new LShiftXNode(src_offset, phase->intcon(shift))); + Node* dest_scale = phase->transform(new LShiftXNode(dest_offset, phase->intcon(shift))); + + adr_src = phase->transform(new AddPNode(base_src, adr_src, src_scale)); + adr_dest = phase->transform(new AddPNode(base_dest, adr_dest, dest_scale)); + + adr_src = new AddPNode(base_src, adr_src, phase->MakeConX(header)); + adr_dest = new AddPNode(base_dest, adr_dest, phase->MakeConX(header)); + + adr_src = phase->transform(adr_src); + adr_dest = phase->transform(adr_dest); + + copy_type = dest_elem; + } else { + assert (is_clonebasic(), "should be"); + + disjoint_bases = true; + assert(src->is_AddP(), "should be base + off"); + assert(dest->is_AddP(), "should be base + off"); + adr_src = src; + base_src = src->in(AddPNode::Base); + adr_dest = dest; + base_dest = dest->in(AddPNode::Base); + + assert(phase->type(src->in(AddPNode::Offset))->is_intptr_t()->get_con() == phase->type(dest->in(AddPNode::Offset))->is_intptr_t()->get_con(), "same start offset?"); + BasicType elem = ary_src->klass()->as_array_klass()->element_type()->basic_type(); + if (elem == T_ARRAY) elem = T_OBJECT; + + int diff = arrayOopDesc::base_offset_in_bytes(elem) - phase->type(src->in(AddPNode::Offset))->is_intptr_t()->get_con(); + assert(diff >= 0, "clone should not start after 1st array element"); + if (diff > 0) { + adr_src = phase->transform(new AddPNode(base_src, adr_src, phase->MakeConX(diff))); + adr_dest = phase->transform(new AddPNode(base_dest, adr_dest, phase->MakeConX(diff))); + } + + copy_type = elem; + value_type = ary_src->elem(); + } + return true; +} + +const TypePtr* ArrayCopyNode::get_address_type(PhaseGVN *phase, Node* n) { + const Type* at = phase->type(n); + assert(at != Type::TOP, "unexpected type"); + const TypePtr* atp = at->isa_ptr(); + // adjust atp to be the correct array element address type + atp = atp->add_offset(Type::OffsetBot); + return atp; +} + +void ArrayCopyNode::array_copy_test_overlap(PhaseGVN *phase, bool can_reshape, bool disjoint_bases, int count, Node*& forward_ctl, Node*& backward_ctl) { + Node* ctl = in(TypeFunc::Control); + if (!disjoint_bases && count > 1) { + Node* src_offset = in(ArrayCopyNode::SrcPos); + Node* dest_offset = in(ArrayCopyNode::DestPos); + assert(src_offset != NULL && dest_offset != NULL, "should be"); + Node* cmp = phase->transform(new CmpINode(src_offset, dest_offset)); + Node *bol = phase->transform(new BoolNode(cmp, BoolTest::lt)); + IfNode *iff = new IfNode(ctl, bol, PROB_FAIR, COUNT_UNKNOWN); + + phase->transform(iff); + + forward_ctl = phase->transform(new IfFalseNode(iff)); + backward_ctl = phase->transform(new IfTrueNode(iff)); + } else { + forward_ctl = ctl; + } +} + +Node* ArrayCopyNode::array_copy_forward(PhaseGVN *phase, + bool can_reshape, + Node* forward_ctl, + Node* start_mem_src, + Node* start_mem_dest, + const TypePtr* atp_src, + const TypePtr* atp_dest, + Node* adr_src, + Node* base_src, + Node* adr_dest, + Node* base_dest, + BasicType copy_type, + const Type* value_type, + int count) { + Node* mem = phase->C->top(); + if (!forward_ctl->is_top()) { + // copy forward + mem = start_mem_dest; + + if (count > 0) { + Node* v = LoadNode::make(*phase, forward_ctl, start_mem_src, adr_src, atp_src, value_type, copy_type, MemNode::unordered); + v = phase->transform(v); + mem = StoreNode::make(*phase, forward_ctl, mem, adr_dest, atp_dest, v, copy_type, MemNode::unordered); + mem = phase->transform(mem); + for (int i = 1; i < count; i++) { + Node* off = phase->MakeConX(type2aelembytes(copy_type) * i); + Node* next_src = phase->transform(new AddPNode(base_src,adr_src,off)); + Node* next_dest = phase->transform(new AddPNode(base_dest,adr_dest,off)); + v = LoadNode::make(*phase, forward_ctl, mem, next_src, atp_src, value_type, copy_type, MemNode::unordered); + v = phase->transform(v); + mem = StoreNode::make(*phase, forward_ctl,mem,next_dest,atp_dest,v, copy_type, MemNode::unordered); + mem = phase->transform(mem); + } + } else if(can_reshape) { + PhaseIterGVN* igvn = phase->is_IterGVN(); + igvn->_worklist.push(adr_src); + igvn->_worklist.push(adr_dest); + } + } + return mem; +} + +Node* ArrayCopyNode::array_copy_backward(PhaseGVN *phase, + bool can_reshape, + Node* backward_ctl, + Node* start_mem_src, + Node* start_mem_dest, + const TypePtr* atp_src, + const TypePtr* atp_dest, + Node* adr_src, + Node* base_src, + Node* adr_dest, + Node* base_dest, + BasicType copy_type, + const Type* value_type, + int count) { + Node* mem = phase->C->top(); + if (!backward_ctl->is_top()) { + // copy backward + mem = start_mem_dest; + + if (count > 0) { + for (int i = count-1; i >= 1; i--) { + Node* off = phase->MakeConX(type2aelembytes(copy_type) * i); + Node* next_src = phase->transform(new AddPNode(base_src,adr_src,off)); + Node* next_dest = phase->transform(new AddPNode(base_dest,adr_dest,off)); + Node* v = LoadNode::make(*phase, backward_ctl, mem, next_src, atp_src, value_type, copy_type, MemNode::unordered); + v = phase->transform(v); + mem = StoreNode::make(*phase, backward_ctl,mem,next_dest,atp_dest,v, copy_type, MemNode::unordered); + mem = phase->transform(mem); + } + Node* v = LoadNode::make(*phase, backward_ctl, mem, adr_src, atp_src, value_type, copy_type, MemNode::unordered); + v = phase->transform(v); + mem = StoreNode::make(*phase, backward_ctl, mem, adr_dest, atp_dest, v, copy_type, MemNode::unordered); + mem = phase->transform(mem); + } else if(can_reshape) { + PhaseIterGVN* igvn = phase->is_IterGVN(); + igvn->_worklist.push(adr_src); + igvn->_worklist.push(adr_dest); + } + } + return mem; +} + +bool ArrayCopyNode::finish_transform(PhaseGVN *phase, bool can_reshape, + Node* ctl, Node *mem) { + if (can_reshape) { + PhaseIterGVN* igvn = phase->is_IterGVN(); + igvn->set_delay_transform(false); + if (is_clonebasic()) { + Node* out_mem = proj_out(TypeFunc::Memory); + + if (out_mem->outcnt() != 1 || !out_mem->raw_out(0)->is_MergeMem() || + out_mem->raw_out(0)->outcnt() != 1 || !out_mem->raw_out(0)->raw_out(0)->is_MemBar()) { + assert(!GraphKit::use_ReduceInitialCardMarks(), "can only happen with card marking"); + return false; + } + + igvn->replace_node(out_mem->raw_out(0), mem); + + Node* out_ctl = proj_out(TypeFunc::Control); + igvn->replace_node(out_ctl, ctl); + } else { + // replace fallthrough projections of the ArrayCopyNode by the + // new memory, control and the input IO. + CallProjections callprojs; + extract_projections(&callprojs, true); + + igvn->replace_node(callprojs.fallthrough_ioproj, in(TypeFunc::I_O)); + igvn->replace_node(callprojs.fallthrough_memproj, mem); + igvn->replace_node(callprojs.fallthrough_catchproj, ctl); + + // The ArrayCopyNode is not disconnected. It still has the + // projections for the exception case. Replace current + // ArrayCopyNode with a dummy new one with a top() control so + // that this part of the graph stays consistent but is + // eventually removed. + + set_req(0, phase->C->top()); + remove_dead_region(phase, can_reshape); + } + } else { + if (in(TypeFunc::Control) != ctl) { + // we can't return new memory and control from Ideal at parse time + assert(!is_clonebasic(), "added control for clone?"); + return NULL; + } + } + return true; +} + + +Node *ArrayCopyNode::Ideal(PhaseGVN *phase, bool can_reshape) { + if (remove_dead_region(phase, can_reshape)) return this; + + if (StressArrayCopyMacroNode && !can_reshape) { + phase->record_for_igvn(this); + return NULL; + } + + // See if it's a small array copy and we can inline it as + // loads/stores + // Here we can only do: + // - arraycopy if all arguments were validated before and we don't + // need card marking + // - clone for which we don't need to do card marking + + if (!is_clonebasic() && !is_arraycopy_validated() && + !is_copyofrange_validated() && !is_copyof_validated()) { + return NULL; + } + + if (in(TypeFunc::Control)->is_top() || in(TypeFunc::Memory)->is_top()) { + return NULL; + } + + int count = get_count(phase); + + if (count < 0 || count > ArrayCopyLoadStoreMaxElem) { + return NULL; + } + + Node* mem = try_clone_instance(phase, can_reshape, count); + if (mem != NULL) { + return mem; + } + + Node* adr_src = NULL; + Node* base_src = NULL; + Node* adr_dest = NULL; + Node* base_dest = NULL; + BasicType copy_type = T_ILLEGAL; + const Type* value_type = NULL; + bool disjoint_bases = false; + + if (!prepare_array_copy(phase, can_reshape, + adr_src, base_src, adr_dest, base_dest, + copy_type, value_type, disjoint_bases)) { + return NULL; + } + + Node* src = in(ArrayCopyNode::Src); + Node* dest = in(ArrayCopyNode::Dest); + const TypePtr* atp_src = get_address_type(phase, src); + const TypePtr* atp_dest = get_address_type(phase, dest); + uint alias_idx_src = phase->C->get_alias_index(atp_src); + uint alias_idx_dest = phase->C->get_alias_index(atp_dest); + + Node *in_mem = in(TypeFunc::Memory); + Node *start_mem_src = in_mem; + Node *start_mem_dest = in_mem; + if (in_mem->is_MergeMem()) { + start_mem_src = in_mem->as_MergeMem()->memory_at(alias_idx_src); + start_mem_dest = in_mem->as_MergeMem()->memory_at(alias_idx_dest); + } + + + if (can_reshape) { + assert(!phase->is_IterGVN()->delay_transform(), "cannot delay transforms"); + phase->is_IterGVN()->set_delay_transform(true); + } + + Node* backward_ctl = phase->C->top(); + Node* forward_ctl = phase->C->top(); + array_copy_test_overlap(phase, can_reshape, disjoint_bases, count, forward_ctl, backward_ctl); + + Node* forward_mem = array_copy_forward(phase, can_reshape, forward_ctl, + start_mem_src, start_mem_dest, + atp_src, atp_dest, + adr_src, base_src, adr_dest, base_dest, + copy_type, value_type, count); + + Node* backward_mem = array_copy_backward(phase, can_reshape, backward_ctl, + start_mem_src, start_mem_dest, + atp_src, atp_dest, + adr_src, base_src, adr_dest, base_dest, + copy_type, value_type, count); + + Node* ctl = NULL; + if (!forward_ctl->is_top() && !backward_ctl->is_top()) { + ctl = new RegionNode(3); + mem = new PhiNode(ctl, Type::MEMORY, atp_dest); + ctl->init_req(1, forward_ctl); + mem->init_req(1, forward_mem); + ctl->init_req(2, backward_ctl); + mem->init_req(2, backward_mem); + ctl = phase->transform(ctl); + mem = phase->transform(mem); + } else if (!forward_ctl->is_top()) { + ctl = forward_ctl; + mem = forward_mem; + } else { + assert(!backward_ctl->is_top(), "no copy?"); + ctl = backward_ctl; + mem = backward_mem; + } + + if (can_reshape) { + assert(phase->is_IterGVN()->delay_transform(), "should be delaying transforms"); + phase->is_IterGVN()->set_delay_transform(false); + } + + MergeMemNode* out_mem = MergeMemNode::make(in_mem); + out_mem->set_memory_at(alias_idx_dest, mem); + mem = out_mem; + + if (!finish_transform(phase, can_reshape, ctl, mem)) { + return NULL; + } + + return mem; +} diff --git a/hotspot/src/share/vm/opto/arraycopynode.hpp b/hotspot/src/share/vm/opto/arraycopynode.hpp new file mode 100644 index 00000000000..e61f1ba2c4b --- /dev/null +++ b/hotspot/src/share/vm/opto/arraycopynode.hpp @@ -0,0 +1,164 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef SHARE_VM_OPTO_ARRAYCOPYNODE_HPP +#define SHARE_VM_OPTO_ARRAYCOPYNODE_HPP + +#include "opto/callnode.hpp" + +class GraphKit; + +class ArrayCopyNode : public CallNode { +private: + + // What kind of arraycopy variant is this? + enum { + None, // not set yet + ArrayCopy, // System.arraycopy() + CloneBasic, // A clone that can be copied by 64 bit chunks + CloneOop, // An oop array clone + CopyOf, // Arrays.copyOf() + CopyOfRange // Arrays.copyOfRange() + } _kind; + +#ifndef PRODUCT + static const char* _kind_names[CopyOfRange+1]; +#endif + // Is the alloc obtained with + // AllocateArrayNode::Ideal_array_allocation() tighly coupled + // (arraycopy follows immediately the allocation)? + // We cache the result of LibraryCallKit::tightly_coupled_allocation + // here because it's much easier to find whether there's a tightly + // couple allocation at parse time than at macro expansion time. At + // macro expansion time, for every use of the allocation node we + // would need to figure out whether it happens after the arraycopy (and + // can be ignored) or between the allocation and the arraycopy. At + // parse time, it's straightforward because whatever happens after + // the arraycopy is not parsed yet so doesn't exist when + // LibraryCallKit::tightly_coupled_allocation() is called. + bool _alloc_tightly_coupled; + + bool _arguments_validated; + + static const TypeFunc* arraycopy_type() { + const Type** fields = TypeTuple::fields(ParmLimit - TypeFunc::Parms); + fields[Src] = TypeInstPtr::BOTTOM; + fields[SrcPos] = TypeInt::INT; + fields[Dest] = TypeInstPtr::BOTTOM; + fields[DestPos] = TypeInt::INT; + fields[Length] = TypeInt::INT; + fields[SrcLen] = TypeInt::INT; + fields[DestLen] = TypeInt::INT; + fields[SrcKlass] = TypeKlassPtr::BOTTOM; + fields[DestKlass] = TypeKlassPtr::BOTTOM; + const TypeTuple *domain = TypeTuple::make(ParmLimit, fields); + + // create result type (range) + fields = TypeTuple::fields(0); + + const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+0, fields); + + return TypeFunc::make(domain, range); + } + + ArrayCopyNode(Compile* C, bool alloc_tightly_coupled); + + intptr_t get_length_if_constant(PhaseGVN *phase) const; + int get_count(PhaseGVN *phase) const; + static const TypePtr* get_address_type(PhaseGVN *phase, Node* n); + + Node* try_clone_instance(PhaseGVN *phase, bool can_reshape, int count); + Node* conv_I2X_offset(PhaseGVN *phase, Node* offset, const TypeAryPtr* ary_t); + bool prepare_array_copy(PhaseGVN *phase, bool can_reshape, + Node*& adr_src, Node*& base_src, Node*& adr_dest, Node*& base_dest, + BasicType& copy_type, const Type*& value_type, bool& disjoint_bases); + void array_copy_test_overlap(PhaseGVN *phase, bool can_reshape, + bool disjoint_bases, int count, + Node*& forward_ctl, Node*& backward_ctl); + Node* array_copy_forward(PhaseGVN *phase, bool can_reshape, Node* ctl, + Node* start_mem_src, Node* start_mem_dest, + const TypePtr* atp_src, const TypePtr* atp_dest, + Node* adr_src, Node* base_src, Node* adr_dest, Node* base_dest, + BasicType copy_type, const Type* value_type, int count); + Node* array_copy_backward(PhaseGVN *phase, bool can_reshape, Node* ctl, + Node *start_mem_src, Node* start_mem_dest, + const TypePtr* atp_src, const TypePtr* atp_dest, + Node* adr_src, Node* base_src, Node* adr_dest, Node* base_dest, + BasicType copy_type, const Type* value_type, int count); + bool finish_transform(PhaseGVN *phase, bool can_reshape, + Node* ctl, Node *mem); + +public: + + enum { + Src = TypeFunc::Parms, + SrcPos, + Dest, + DestPos, + Length, + SrcLen, + DestLen, + SrcKlass, + DestKlass, + ParmLimit + }; + + static ArrayCopyNode* make(GraphKit* kit, bool may_throw, + Node* src, Node* src_offset, + Node* dest, Node* dest_offset, + Node* length, + bool alloc_tightly_coupled, + Node* src_klass = NULL, Node* dest_klass = NULL, + Node* src_length = NULL, Node* dest_length = NULL); + + void connect_outputs(GraphKit* kit); + + bool is_arraycopy() const { assert(_kind != None, "should bet set"); return _kind == ArrayCopy; } + bool is_arraycopy_validated() const { assert(_kind != None, "should bet set"); return _kind == ArrayCopy && _arguments_validated; } + bool is_clonebasic() const { assert(_kind != None, "should bet set"); return _kind == CloneBasic; } + bool is_cloneoop() const { assert(_kind != None, "should bet set"); return _kind == CloneOop; } + bool is_copyof() const { assert(_kind != None, "should bet set"); return _kind == CopyOf; } + bool is_copyof_validated() const { assert(_kind != None, "should bet set"); return _kind == CopyOf && _arguments_validated; } + bool is_copyofrange() const { assert(_kind != None, "should bet set"); return _kind == CopyOfRange; } + bool is_copyofrange_validated() const { assert(_kind != None, "should bet set"); return _kind == CopyOfRange && _arguments_validated; } + + void set_arraycopy(bool validated) { assert(_kind == None, "shouldn't bet set yet"); _kind = ArrayCopy; _arguments_validated = validated; } + void set_clonebasic() { assert(_kind == None, "shouldn't bet set yet"); _kind = CloneBasic; } + void set_cloneoop() { assert(_kind == None, "shouldn't bet set yet"); _kind = CloneOop; } + void set_copyof(bool validated) { assert(_kind == None, "shouldn't bet set yet"); _kind = CopyOf; _arguments_validated = validated; } + void set_copyofrange(bool validated) { assert(_kind == None, "shouldn't bet set yet"); _kind = CopyOfRange; _arguments_validated = validated; } + + virtual int Opcode() const; + virtual uint size_of() const; // Size is bigger + virtual bool guaranteed_safepoint() { return false; } + virtual Node *Ideal(PhaseGVN *phase, bool can_reshape); + + bool is_alloc_tightly_coupled() const { return _alloc_tightly_coupled; } + +#ifndef PRODUCT + virtual void dump_spec(outputStream *st) const; +#endif +}; + +#endif // SHARE_VM_OPTO_ARRAYCOPYNODE_HPP diff --git a/hotspot/src/share/vm/opto/callnode.cpp b/hotspot/src/share/vm/opto/callnode.cpp index a5f173e0327..46975b51e10 100644 --- a/hotspot/src/share/vm/opto/callnode.cpp +++ b/hotspot/src/share/vm/opto/callnode.cpp @@ -1875,194 +1875,3 @@ void AbstractLockNode::log_lock_optimization(Compile *C, const char * tag) cons log->tail(tag); } } - -ArrayCopyNode::ArrayCopyNode(Compile* C, bool alloc_tightly_coupled) - : CallNode(arraycopy_type(), NULL, TypeRawPtr::BOTTOM), - _alloc_tightly_coupled(alloc_tightly_coupled), - _kind(None), - _arguments_validated(false) { - init_class_id(Class_ArrayCopy); - init_flags(Flag_is_macro); - C->add_macro_node(this); -} - -uint ArrayCopyNode::size_of() const { return sizeof(*this); } - -ArrayCopyNode* ArrayCopyNode::make(GraphKit* kit, bool may_throw, - Node* src, Node* src_offset, - Node* dest, Node* dest_offset, - Node* length, - bool alloc_tightly_coupled, - Node* src_klass, Node* dest_klass, - Node* src_length, Node* dest_length) { - - ArrayCopyNode* ac = new ArrayCopyNode(kit->C, alloc_tightly_coupled); - Node* prev_mem = kit->set_predefined_input_for_runtime_call(ac); - - ac->init_req(ArrayCopyNode::Src, src); - ac->init_req(ArrayCopyNode::SrcPos, src_offset); - ac->init_req(ArrayCopyNode::Dest, dest); - ac->init_req(ArrayCopyNode::DestPos, dest_offset); - ac->init_req(ArrayCopyNode::Length, length); - ac->init_req(ArrayCopyNode::SrcLen, src_length); - ac->init_req(ArrayCopyNode::DestLen, dest_length); - ac->init_req(ArrayCopyNode::SrcKlass, src_klass); - ac->init_req(ArrayCopyNode::DestKlass, dest_klass); - - if (may_throw) { - ac->set_req(TypeFunc::I_O , kit->i_o()); - kit->add_safepoint_edges(ac, false); - } - - return ac; -} - -void ArrayCopyNode::connect_outputs(GraphKit* kit) { - kit->set_all_memory_call(this, true); - kit->set_control(kit->gvn().transform(new ProjNode(this,TypeFunc::Control))); - kit->set_i_o(kit->gvn().transform(new ProjNode(this, TypeFunc::I_O))); - kit->make_slow_call_ex(this, kit->env()->Throwable_klass(), true); - kit->set_all_memory_call(this); -} - -#ifndef PRODUCT -const char* ArrayCopyNode::_kind_names[] = {"arraycopy", "arraycopy, validated arguments", "clone", "oop array clone", "CopyOf", "CopyOfRange"}; -void ArrayCopyNode::dump_spec(outputStream *st) const { - CallNode::dump_spec(st); - st->print(" (%s%s)", _kind_names[_kind], _alloc_tightly_coupled ? ", tightly coupled allocation" : ""); -} -#endif - -int ArrayCopyNode::get_count(PhaseGVN *phase) const { - Node* src = in(ArrayCopyNode::Src); - const Type* src_type = phase->type(src); - - assert(is_clonebasic(), "unexpected arraycopy type"); - if (src_type->isa_instptr()) { - const TypeInstPtr* inst_src = src_type->is_instptr(); - ciInstanceKlass* ik = inst_src->klass()->as_instance_klass(); - // ciInstanceKlass::nof_nonstatic_fields() doesn't take injected - // fields into account. They are rare anyway so easier to simply - // skip instances with injected fields. - if ((!inst_src->klass_is_exact() && (ik->is_interface() || ik->has_subklass())) || ik->has_injected_fields()) { - return -1; - } - int nb_fields = ik->nof_nonstatic_fields(); - return nb_fields; - } - return -1; -} - -Node* ArrayCopyNode::try_clone_instance(PhaseGVN *phase, bool can_reshape, int count) { - assert(is_clonebasic(), "unexpected arraycopy type"); - - Node* src = in(ArrayCopyNode::Src); - Node* dest = in(ArrayCopyNode::Dest); - Node* ctl = in(TypeFunc::Control); - Node* in_mem = in(TypeFunc::Memory); - - const Type* src_type = phase->type(src); - const Type* dest_type = phase->type(dest); - - assert(src->is_AddP(), "should be base + off"); - assert(dest->is_AddP(), "should be base + off"); - Node* base_src = src->in(AddPNode::Base); - Node* base_dest = dest->in(AddPNode::Base); - - MergeMemNode* mem = MergeMemNode::make(in_mem); - - const TypeInstPtr* inst_src = src_type->is_instptr(); - - if (!inst_src->klass_is_exact()) { - ciInstanceKlass* ik = inst_src->klass()->as_instance_klass(); - assert(!ik->is_interface() && !ik->has_subklass(), "inconsistent klass hierarchy"); - phase->C->dependencies()->assert_leaf_type(ik); - } - - ciInstanceKlass* ik = inst_src->klass()->as_instance_klass(); - assert(ik->nof_nonstatic_fields() <= ArrayCopyLoadStoreMaxElem, "too many fields"); - - for (int i = 0; i < count; i++) { - ciField* field = ik->nonstatic_field_at(i); - int fieldidx = phase->C->alias_type(field)->index(); - const TypePtr* adr_type = phase->C->alias_type(field)->adr_type(); - Node* off = phase->MakeConX(field->offset()); - Node* next_src = phase->transform(new AddPNode(base_src,base_src,off)); - Node* next_dest = phase->transform(new AddPNode(base_dest,base_dest,off)); - BasicType bt = field->layout_type(); - - const Type *type; - if (bt == T_OBJECT) { - if (!field->type()->is_loaded()) { - type = TypeInstPtr::BOTTOM; - } else { - ciType* field_klass = field->type(); - type = TypeOopPtr::make_from_klass(field_klass->as_klass()); - } - } else { - type = Type::get_const_basic_type(bt); - } - - Node* v = LoadNode::make(*phase, ctl, mem->memory_at(fieldidx), next_src, adr_type, type, bt, MemNode::unordered); - v = phase->transform(v); - Node* s = StoreNode::make(*phase, ctl, mem->memory_at(fieldidx), next_dest, adr_type, v, bt, MemNode::unordered); - s = phase->transform(s); - mem->set_memory_at(fieldidx, s); - } - - if (!finish_transform(phase, can_reshape, ctl, mem)) { - return NULL; - } - - return mem; -} - -bool ArrayCopyNode::finish_transform(PhaseGVN *phase, bool can_reshape, - Node* ctl, Node *mem) { - if (can_reshape) { - PhaseIterGVN* igvn = phase->is_IterGVN(); - assert(is_clonebasic(), "unexpected arraycopy type"); - Node* out_mem = proj_out(TypeFunc::Memory); - - if (out_mem->outcnt() != 1 || !out_mem->raw_out(0)->is_MergeMem() || - out_mem->raw_out(0)->outcnt() != 1 || !out_mem->raw_out(0)->raw_out(0)->is_MemBar()) { - assert(!GraphKit::use_ReduceInitialCardMarks(), "can only happen with card marking"); - return false; - } - - igvn->replace_node(out_mem->raw_out(0), mem); - - Node* out_ctl = proj_out(TypeFunc::Control); - igvn->replace_node(out_ctl, ctl); - } - return true; -} - - -Node *ArrayCopyNode::Ideal(PhaseGVN *phase, bool can_reshape) { - if (remove_dead_region(phase, can_reshape)) return this; - - if (StressArrayCopyMacroNode && !can_reshape) return NULL; - - // See if it's a small array copy and we can inline it as - // loads/stores - // Here we can only do: - // - clone for which we don't need to do card marking - - if (!is_clonebasic()) { - return NULL; - } - - if (in(TypeFunc::Control)->is_top() || in(TypeFunc::Memory)->is_top()) { - return NULL; - } - - int count = get_count(phase); - - if (count < 0 || count > ArrayCopyLoadStoreMaxElem) { - return NULL; - } - - Node* mem = try_clone_instance(phase, can_reshape, count); - return mem; -} diff --git a/hotspot/src/share/vm/opto/callnode.hpp b/hotspot/src/share/vm/opto/callnode.hpp index 66ea270320f..26f5c6ba705 100644 --- a/hotspot/src/share/vm/opto/callnode.hpp +++ b/hotspot/src/share/vm/opto/callnode.hpp @@ -1083,117 +1083,4 @@ public: #endif }; -class GraphKit; - -class ArrayCopyNode : public CallNode { -private: - - // What kind of arraycopy variant is this? - enum { - None, // not set yet - ArrayCopy, // System.arraycopy() - CloneBasic, // A clone that can be copied by 64 bit chunks - CloneOop, // An oop array clone - CopyOf, // Arrays.copyOf() - CopyOfRange // Arrays.copyOfRange() - } _kind; - -#ifndef PRODUCT - static const char* _kind_names[CopyOfRange+1]; -#endif - // Is the alloc obtained with - // AllocateArrayNode::Ideal_array_allocation() tighly coupled - // (arraycopy follows immediately the allocation)? - // We cache the result of LibraryCallKit::tightly_coupled_allocation - // here because it's much easier to find whether there's a tightly - // couple allocation at parse time than at macro expansion time. At - // macro expansion time, for every use of the allocation node we - // would need to figure out whether it happens after the arraycopy (and - // can be ignored) or between the allocation and the arraycopy. At - // parse time, it's straightforward because whatever happens after - // the arraycopy is not parsed yet so doesn't exist when - // LibraryCallKit::tightly_coupled_allocation() is called. - bool _alloc_tightly_coupled; - - bool _arguments_validated; - - static const TypeFunc* arraycopy_type() { - const Type** fields = TypeTuple::fields(ParmLimit - TypeFunc::Parms); - fields[Src] = TypeInstPtr::BOTTOM; - fields[SrcPos] = TypeInt::INT; - fields[Dest] = TypeInstPtr::BOTTOM; - fields[DestPos] = TypeInt::INT; - fields[Length] = TypeInt::INT; - fields[SrcLen] = TypeInt::INT; - fields[DestLen] = TypeInt::INT; - fields[SrcKlass] = TypeKlassPtr::BOTTOM; - fields[DestKlass] = TypeKlassPtr::BOTTOM; - const TypeTuple *domain = TypeTuple::make(ParmLimit, fields); - - // create result type (range) - fields = TypeTuple::fields(0); - - const TypeTuple *range = TypeTuple::make(TypeFunc::Parms+0, fields); - - return TypeFunc::make(domain, range); - } - - ArrayCopyNode(Compile* C, bool alloc_tightly_coupled); - - int get_count(PhaseGVN *phase) const; - static const TypePtr* get_address_type(PhaseGVN *phase, Node* n); - - Node* try_clone_instance(PhaseGVN *phase, bool can_reshape, int count); - bool finish_transform(PhaseGVN *phase, bool can_reshape, - Node* ctl, Node *mem); - -public: - - enum { - Src = TypeFunc::Parms, - SrcPos, - Dest, - DestPos, - Length, - SrcLen, - DestLen, - SrcKlass, - DestKlass, - ParmLimit - }; - - static ArrayCopyNode* make(GraphKit* kit, bool may_throw, - Node* src, Node* src_offset, - Node* dest, Node* dest_offset, - Node* length, - bool alloc_tightly_coupled, - Node* src_klass = NULL, Node* dest_klass = NULL, - Node* src_length = NULL, Node* dest_length = NULL); - - void connect_outputs(GraphKit* kit); - - bool is_arraycopy() const { assert(_kind != None, "should bet set"); return _kind == ArrayCopy; } - bool is_arraycopy_validated() const { assert(_kind != None, "should bet set"); return _kind == ArrayCopy && _arguments_validated; } - bool is_clonebasic() const { assert(_kind != None, "should bet set"); return _kind == CloneBasic; } - bool is_cloneoop() const { assert(_kind != None, "should bet set"); return _kind == CloneOop; } - bool is_copyof() const { assert(_kind != None, "should bet set"); return _kind == CopyOf; } - bool is_copyofrange() const { assert(_kind != None, "should bet set"); return _kind == CopyOfRange; } - - void set_arraycopy(bool validated) { assert(_kind == None, "shouldn't bet set yet"); _kind = ArrayCopy; _arguments_validated = validated; } - void set_clonebasic() { assert(_kind == None, "shouldn't bet set yet"); _kind = CloneBasic; } - void set_cloneoop() { assert(_kind == None, "shouldn't bet set yet"); _kind = CloneOop; } - void set_copyof() { assert(_kind == None, "shouldn't bet set yet"); _kind = CopyOf; _arguments_validated = false; } - void set_copyofrange() { assert(_kind == None, "shouldn't bet set yet"); _kind = CopyOfRange; _arguments_validated = false; } - - virtual int Opcode() const; - virtual uint size_of() const; // Size is bigger - virtual bool guaranteed_safepoint() { return false; } - virtual Node *Ideal(PhaseGVN *phase, bool can_reshape); - - bool is_alloc_tightly_coupled() const { return _alloc_tightly_coupled; } - -#ifndef PRODUCT - virtual void dump_spec(outputStream *st) const; -#endif -}; #endif // SHARE_VM_OPTO_CALLNODE_HPP diff --git a/hotspot/src/share/vm/opto/classes.cpp b/hotspot/src/share/vm/opto/classes.cpp index a3113922209..cf63ea1db1f 100644 --- a/hotspot/src/share/vm/opto/classes.cpp +++ b/hotspot/src/share/vm/opto/classes.cpp @@ -24,6 +24,7 @@ #include "precompiled.hpp" #include "opto/addnode.hpp" +#include "opto/arraycopynode.hpp" #include "opto/callnode.hpp" #include "opto/castnode.hpp" #include "opto/cfgnode.hpp" diff --git a/hotspot/src/share/vm/opto/compile.cpp b/hotspot/src/share/vm/opto/compile.cpp index b2a29982e0f..a16da77ae30 100644 --- a/hotspot/src/share/vm/opto/compile.cpp +++ b/hotspot/src/share/vm/opto/compile.cpp @@ -42,6 +42,7 @@ #include "opto/chaitin.hpp" #include "opto/compile.hpp" #include "opto/connode.hpp" +#include "opto/convertnode.hpp" #include "opto/divnode.hpp" #include "opto/escape.hpp" #include "opto/idealGraphPrinter.hpp" @@ -3866,6 +3867,26 @@ int Compile::static_subtype_check(ciKlass* superk, ciKlass* subk) { return SSC_full_test; } +Node* Compile::conv_I2X_index(PhaseGVN *phase, Node* idx, const TypeInt* sizetype) { +#ifdef _LP64 + // The scaled index operand to AddP must be a clean 64-bit value. + // Java allows a 32-bit int to be incremented to a negative + // value, which appears in a 64-bit register as a large + // positive number. Using that large positive number as an + // operand in pointer arithmetic has bad consequences. + // On the other hand, 32-bit overflow is rare, and the possibility + // can often be excluded, if we annotate the ConvI2L node with + // a type assertion that its value is known to be a small positive + // number. (The prior range check has ensured this.) + // This assertion is used by ConvI2LNode::Ideal. + int index_max = max_jint - 1; // array size is max_jint, index is one less + if (sizetype != NULL) index_max = sizetype->_hi - 1; + const TypeLong* lidxtype = TypeLong::make(CONST64(0), index_max, Type::WidenMax); + idx = phase->transform(new ConvI2LNode(idx, lidxtype)); +#endif + return idx; +} + // The message about the current inlining is accumulated in // _print_inlining_stream and transfered into the _print_inlining_list // once we know whether inlining succeeds or not. For regular diff --git a/hotspot/src/share/vm/opto/compile.hpp b/hotspot/src/share/vm/opto/compile.hpp index c901da09405..2b9c3346997 100644 --- a/hotspot/src/share/vm/opto/compile.hpp +++ b/hotspot/src/share/vm/opto/compile.hpp @@ -74,6 +74,7 @@ class SafePointNode; class JVMState; class Type; class TypeData; +class TypeInt; class TypePtr; class TypeOopPtr; class TypeFunc; @@ -1221,6 +1222,8 @@ class Compile : public Phase { enum { SSC_always_false, SSC_always_true, SSC_easy_test, SSC_full_test }; int static_subtype_check(ciKlass* superk, ciKlass* subk); + static Node* conv_I2X_index(PhaseGVN *phase, Node* offset, const TypeInt* sizetype); + // Auxiliary method for randomized fuzzing/stressing static bool randomized_select(int count); }; diff --git a/hotspot/src/share/vm/opto/graphKit.cpp b/hotspot/src/share/vm/opto/graphKit.cpp index 6108198b9c6..ecac34f31c0 100644 --- a/hotspot/src/share/vm/opto/graphKit.cpp +++ b/hotspot/src/share/vm/opto/graphKit.cpp @@ -1660,22 +1660,7 @@ Node* GraphKit::array_element_address(Node* ary, Node* idx, BasicType elembt, // must be correct type for alignment purposes Node* base = basic_plus_adr(ary, header); -#ifdef _LP64 - // The scaled index operand to AddP must be a clean 64-bit value. - // Java allows a 32-bit int to be incremented to a negative - // value, which appears in a 64-bit register as a large - // positive number. Using that large positive number as an - // operand in pointer arithmetic has bad consequences. - // On the other hand, 32-bit overflow is rare, and the possibility - // can often be excluded, if we annotate the ConvI2L node with - // a type assertion that its value is known to be a small positive - // number. (The prior range check has ensured this.) - // This assertion is used by ConvI2LNode::Ideal. - int index_max = max_jint - 1; // array size is max_jint, index is one less - if (sizetype != NULL) index_max = sizetype->_hi - 1; - const TypeLong* lidxtype = TypeLong::make(CONST64(0), index_max, Type::WidenMax); - idx = _gvn.transform( new ConvI2LNode(idx, lidxtype) ); -#endif + idx = Compile::conv_I2X_index(&_gvn, idx, sizetype); Node* scale = _gvn.transform( new LShiftXNode(idx, intcon(shift)) ); return basic_plus_adr(ary, base, scale); } diff --git a/hotspot/src/share/vm/opto/library_call.cpp b/hotspot/src/share/vm/opto/library_call.cpp index 724c12d5e7a..e46d8b52754 100644 --- a/hotspot/src/share/vm/opto/library_call.cpp +++ b/hotspot/src/share/vm/opto/library_call.cpp @@ -30,6 +30,7 @@ #include "compiler/compileLog.hpp" #include "oops/objArrayKlass.hpp" #include "opto/addnode.hpp" +#include "opto/arraycopynode.hpp" #include "opto/callGenerator.hpp" #include "opto/castnode.hpp" #include "opto/cfgnode.hpp" @@ -3876,18 +3877,57 @@ bool LibraryCallKit::inline_array_copyOf(bool is_copyOfRange) { // Extreme case: Arrays.copyOf((Integer[])x, 10, String[].class). // This will fail a store-check if x contains any non-nulls. - Node* alloc = tightly_coupled_allocation(newcopy, NULL); + // ArrayCopyNode:Ideal may transform the ArrayCopyNode to + // loads/stores but it is legal only if we're sure the + // Arrays.copyOf would succeed. So we need all input arguments + // to the copyOf to be validated, including that the copy to the + // new array won't trigger an ArrayStoreException. That subtype + // check can be optimized if we know something on the type of + // the input array from type speculation. + if (_gvn.type(klass_node)->singleton()) { + ciKlass* subk = _gvn.type(load_object_klass(original))->is_klassptr()->klass(); + ciKlass* superk = _gvn.type(klass_node)->is_klassptr()->klass(); - ArrayCopyNode* ac = ArrayCopyNode::make(this, true, original, start, newcopy, intcon(0), moved, alloc != NULL, + int test = C->static_subtype_check(superk, subk); + if (test != Compile::SSC_always_true && test != Compile::SSC_always_false) { + const TypeOopPtr* t_original = _gvn.type(original)->is_oopptr(); + if (t_original->speculative_type() != NULL) { + original = maybe_cast_profiled_obj(original, t_original->speculative_type(), true); + } + } + } + + bool validated = false; + // Reason_class_check rather than Reason_intrinsic because we + // want to intrinsify even if this traps. + if (!too_many_traps(Deoptimization::Reason_class_check)) { + Node* not_subtype_ctrl = gen_subtype_check(load_object_klass(original), + klass_node); + + if (not_subtype_ctrl != top()) { + PreserveJVMState pjvms(this); + set_control(not_subtype_ctrl); + uncommon_trap(Deoptimization::Reason_class_check, + Deoptimization::Action_make_not_entrant); + assert(stopped(), "Should be stopped"); + } + validated = true; + } + + ArrayCopyNode* ac = ArrayCopyNode::make(this, true, original, start, newcopy, intcon(0), moved, true, load_object_klass(original), klass_node); if (!is_copyOfRange) { - ac->set_copyof(); + ac->set_copyof(validated); } else { - ac->set_copyofrange(); + ac->set_copyofrange(validated); } Node* n = _gvn.transform(ac); - assert(n == ac, "cannot disappear"); - ac->connect_outputs(this); + if (n == ac) { + ac->connect_outputs(this); + } else { + assert(validated, "shouldn't transform if all arguments not validated"); + set_all_memory(n); + } } } // original reexecute is set back here diff --git a/hotspot/src/share/vm/opto/macroArrayCopy.cpp b/hotspot/src/share/vm/opto/macroArrayCopy.cpp index 503bd44bbb6..d6f0caeb955 100644 --- a/hotspot/src/share/vm/opto/macroArrayCopy.cpp +++ b/hotspot/src/share/vm/opto/macroArrayCopy.cpp @@ -23,6 +23,7 @@ */ #include "precompiled.hpp" +#include "opto/arraycopynode.hpp" #include "oops/objArrayKlass.hpp" #include "opto/convertnode.hpp" #include "opto/graphKit.hpp" @@ -519,7 +520,7 @@ Node* PhaseMacroExpand::generate_arraycopy(ArrayCopyNode *ac, AllocateArrayNode* // Test S[] against D[], not S against D, because (probably) // the secondary supertype cache is less busy for S[] than S. // This usually only matters when D is an interface. - Node* not_subtype_ctrl = ac->is_arraycopy_validated() ? top() : + Node* not_subtype_ctrl = (ac->is_arraycopy_validated() || ac->is_copyof_validated() || ac->is_copyofrange_validated()) ? top() : Phase::gen_subtype_check(src_klass, dest_klass, ctrl, mem, &_igvn); // Plug failing path into checked_oop_disjoint_arraycopy if (not_subtype_ctrl != top()) { diff --git a/hotspot/test/compiler/arraycopy/TestArrayCopyAsLoadsStores.java b/hotspot/test/compiler/arraycopy/TestArrayCopyAsLoadsStores.java new file mode 100644 index 00000000000..f1ea4c2368a --- /dev/null +++ b/hotspot/test/compiler/arraycopy/TestArrayCopyAsLoadsStores.java @@ -0,0 +1,618 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 6912521 + * @summary small array copy as loads/stores + * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:CompileCommand=dontinline,TestArrayCopyAsLoadsStores::m* -XX:TypeProfileLevel=200 TestArrayCopyAsLoadsStores + * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:CompileCommand=dontinline,TestArrayCopyAsLoadsStores::m* -XX:+IgnoreUnrecognizedVMOptions -XX:+StressArrayCopyMacroNode -XX:TypeProfileLevel=200 TestArrayCopyAsLoadsStores + * + */ + +import java.lang.annotation.*; +import java.lang.reflect.*; +import java.util.*; + +public class TestArrayCopyAsLoadsStores { + + public enum ArraySrc { + SMALL, + LARGE, + ZERO + } + + public enum ArrayDst { + NONE, + NEW, + SRC + } + + static class A { + } + + static class B extends A { + } + + static final A[] small_a_src = new A[5]; + static final A[] large_a_src = new A[10]; + static final A[] zero_a_src = new A[0]; + static final int[] small_int_src = new int[5]; + static final int[] large_int_src = new int[10]; + static final int[] zero_int_src = new int[0]; + static final Object[] small_object_src = new Object[5]; + static Object src; + + @Retention(RetentionPolicy.RUNTIME) + @interface Args { + ArraySrc src(); + ArrayDst dst() default ArrayDst.NONE; + int[] extra_args() default {}; + } + + // array clone should be compiled as loads/stores + @Args(src=ArraySrc.SMALL) + static A[] m1() throws CloneNotSupportedException { + return (A[])small_a_src.clone(); + } + + @Args(src=ArraySrc.SMALL) + static int[] m2() throws CloneNotSupportedException { + return (int[])small_int_src.clone(); + } + + // new array allocation should be optimized out + @Args(src=ArraySrc.SMALL) + static int m3() throws CloneNotSupportedException { + int[] array_clone = (int[])small_int_src.clone(); + return array_clone[0] + array_clone[1] + array_clone[2] + + array_clone[3] + array_clone[4]; + } + + // should not be compiled as loads/stores + @Args(src=ArraySrc.LARGE) + static int[] m4() throws CloneNotSupportedException { + return (int[])large_int_src.clone(); + } + + // check that array of length 0 is handled correctly + @Args(src=ArraySrc.ZERO) + static int[] m5() throws CloneNotSupportedException { + return (int[])zero_int_src.clone(); + } + + // array copy should be compiled as loads/stores + @Args(src=ArraySrc.SMALL, dst=ArrayDst.NEW) + static void m6(int[] src, int[] dest) { + System.arraycopy(src, 0, dest, 0, 5); + } + + // array copy should not be compiled as loads/stores + @Args(src=ArraySrc.LARGE, dst=ArrayDst.NEW) + static void m7(int[] src, int[] dest) { + System.arraycopy(src, 0, dest, 0, 10); + } + + // array copy should be compiled as loads/stores + @Args(src=ArraySrc.SMALL) + static A[] m8(A[] src) { + src[0] = src[0]; // force null check + A[] dest = new A[5]; + System.arraycopy(src, 0, dest, 0, 5); + return dest; + } + + // array copy should not be compiled as loads/stores: we would + // need to emit GC barriers + @Args(src=ArraySrc.SMALL, dst=ArrayDst.NEW) + static void m9(A[] src, A[] dest) { + System.arraycopy(src, 0, dest, 0, 5); + } + + // overlapping array regions: copy backward + @Args(src=ArraySrc.SMALL, dst=ArrayDst.SRC) + static void m10(int[] src, int[] dest) { + System.arraycopy(src, 0, dest, 1, 4); + } + + static boolean m10_check(int[] src, int[] dest) { + boolean failure = false; + for (int i = 0; i < 5; i++) { + int j = Math.max(i - 1, 0); + if (dest[i] != src[j]) { + System.out.println("Test m10 failed for " + i + " src[" + j +"]=" + src[j] + ", dest[" + i + "]=" + dest[i]); + failure = true; + } + } + return failure; + } + + // overlapping array regions: copy forward + @Args(src=ArraySrc.SMALL, dst=ArrayDst.SRC) + static void m11(int[] src, int[] dest) { + System.arraycopy(src, 1, dest, 0, 4); + } + + static boolean m11_check(int[] src, int[] dest) { + boolean failure = false; + for (int i = 0; i < 5; i++) { + int j = Math.min(i + 1, 4); + if (dest[i] != src[j]) { + System.out.println("Test m11 failed for " + i + " src[" + j +"]=" + src[j] + ", dest[" + i + "]=" + dest[i]); + failure = true; + } + } + return failure; + } + + // overlapping array region with unknown src/dest offsets: compiled code must include both forward and backward copies + @Args(src=ArraySrc.SMALL, dst=ArrayDst.SRC, extra_args={0,1}) + static void m12(int[] src, int[] dest, int srcPos, int destPos) { + System.arraycopy(src, srcPos, dest, destPos, 4); + } + + static boolean m12_check(int[] src, int[] dest) { + boolean failure = false; + for (int i = 0; i < 5; i++) { + int j = Math.max(i - 1, 0); + if (dest[i] != src[j]) { + System.out.println("Test m10 failed for " + i + " src[" + j +"]=" + src[j] + ", dest[" + i + "]=" + dest[i]); + failure = true; + } + } + return failure; + } + + // Array allocation and copy should optimize out + @Args(src=ArraySrc.SMALL) + static int m13(int[] src) { + int[] dest = new int[5]; + System.arraycopy(src, 0, dest, 0, 5); + return dest[0] + dest[1] + dest[2] + dest[3] + dest[4]; + } + + // Check that copy of length 0 is handled correctly + @Args(src=ArraySrc.ZERO, dst=ArrayDst.NEW) + static void m14(int[] src, int[] dest) { + System.arraycopy(src, 0, dest, 0, 0); + } + + // copyOf should compile to loads/stores + @Args(src=ArraySrc.SMALL) + static A[] m15() { + return Arrays.copyOf(small_a_src, 5, A[].class); + } + + static Object[] helper16(int i) { + Object[] arr = null; + if ((i%2) == 0) { + arr = small_a_src; + } else { + arr = small_object_src; + } + return arr; + } + + // CopyOf may need subtype check + @Args(src=ArraySrc.SMALL, dst=ArrayDst.NONE, extra_args={0}) + static A[] m16(A[] unused_src, int i) { + Object[] arr = helper16(i); + return Arrays.copyOf(arr, 5, A[].class); + } + + static Object[] helper17_1(int i) { + Object[] arr = null; + if ((i%2) == 0) { + arr = small_a_src; + } else { + arr = small_object_src; + } + return arr; + } + + static A[] helper17_2(Object[] arr) { + return Arrays.copyOf(arr, 5, A[].class); + } + + // CopyOf may leverage type speculation + @Args(src=ArraySrc.SMALL, dst=ArrayDst.NONE, extra_args={0}) + static A[] m17(A[] unused_src, int i) { + Object[] arr = helper17_1(i); + return helper17_2(arr); + } + + static Object[] helper18_1(int i) { + Object[] arr = null; + if ((i%2) == 0) { + arr = small_a_src; + } else { + arr = small_object_src; + } + return arr; + } + + static Object[] helper18_2(Object[] arr) { + return Arrays.copyOf(arr, 5, Object[].class); + } + + // CopyOf should not attempt to use type speculation if it's not needed + @Args(src=ArraySrc.SMALL, dst=ArrayDst.NONE, extra_args={0}) + static Object[] m18(A[] unused_src, int i) { + Object[] arr = helper18_1(i); + return helper18_2(arr); + } + + static Object[] helper19(int i) { + Object[] arr = null; + if ((i%2) == 0) { + arr = small_a_src; + } else { + arr = small_object_src; + } + return arr; + } + + // CopyOf may need subtype check. Test is run to make type check + // fail and cause deoptimization. Next compilation should not + // compile as loads/stores because the first compilation + // deoptimized. + @Args(src=ArraySrc.SMALL, dst=ArrayDst.NONE, extra_args={0}) + static A[] m19(A[] unused_src, int i) { + Object[] arr = helper19(i); + return Arrays.copyOf(arr, 5, A[].class); + } + + // copyOf for large array should not compile to loads/stores + @Args(src=ArraySrc.LARGE) + static A[] m20() { + return Arrays.copyOf(large_a_src, 10, A[].class); + } + + // check zero length copyOf is handled correctly + @Args(src=ArraySrc.ZERO) + static A[] m21() { + return Arrays.copyOf(zero_a_src, 0, A[].class); + } + + // Run with srcPos=0 for a 1st compile, then with incorrect value + // of srcPos to cause deoptimization, then with srcPos=0 for a 2nd + // compile. The 2nd compile shouldn't turn arraycopy into + // loads/stores because input arguments are no longer known to be + // valid. + @Args(src=ArraySrc.SMALL, dst=ArrayDst.NEW, extra_args={0}) + static void m22(int[] src, int[] dest, int srcPos) { + System.arraycopy(src, srcPos, dest, 0, 5); + } + + // copyOfRange should compile to loads/stores + @Args(src=ArraySrc.SMALL) + static A[] m23() { + return Arrays.copyOfRange(small_a_src, 1, 4, A[].class); + } + + static boolean m23_check(A[] src, A[] dest) { + boolean failure = false; + for (int i = 0; i < 3; i++) { + if (src[i+1] != dest[i]) { + System.out.println("Test m23 failed for " + i + " src[" + (i+1) +"]=" + dest[i] + ", dest[" + i + "]=" + dest[i]); + failure = true; + } + } + return failure; + } + + // array copy should be compiled as loads/stores. Invoke then with + // incompatible array type to verify we don't allow a forbidden + // arraycopy to happen. + @Args(src=ArraySrc.SMALL) + static A[] m24(Object[] src) { + src[0] = src[0]; // force null check + A[] dest = new A[5]; + System.arraycopy(src, 0, dest, 0, 5); + return dest; + } + + // overlapping array region with unknown src/dest offsets but + // length 1: compiled code doesn't need both forward and backward + // copies + @Args(src=ArraySrc.SMALL, dst=ArrayDst.SRC, extra_args={0,1}) + static void m25(int[] src, int[] dest, int srcPos, int destPos) { + System.arraycopy(src, srcPos, dest, destPos, 1); + } + + static boolean m25_check(int[] src, int[] dest) { + boolean failure = false; + if (dest[1] != src[0]) { + System.out.println("Test m10 failed for src[0]=" + src[0] + ", dest[1]=" + dest[1]); + return true; + } + return false; + } + + final HashMap tests = new HashMap<>(); + { + for (Method m : this.getClass().getDeclaredMethods()) { + if (m.getName().matches("m[0-9]+(_check)?")) { + assert(Modifier.isStatic(m.getModifiers())) : m; + tests.put(m.getName(), m); + } + } + } + + boolean success = true; + + void doTest(String name) throws Exception { + Method m = tests.get(name); + Method m_check = tests.get(name + "_check"); + Class[] paramTypes = m.getParameterTypes(); + Object[] params = new Object[paramTypes.length]; + Class retType = m.getReturnType(); + boolean isIntArray = (retType.isPrimitive() && !retType.equals(Void.TYPE)) || + (retType.equals(Void.TYPE) && paramTypes[0].getComponentType().isPrimitive()) || + (retType.isArray() && retType.getComponentType().isPrimitive()); + + Args args = m.getAnnotation(Args.class); + + Object src = null; + switch(args.src()) { + case SMALL: { + if (isIntArray) { + src = small_int_src; + } else { + src = small_a_src; + } + break; + } + case LARGE: { + if (isIntArray) { + src = large_int_src; + } else { + src = large_a_src; + } + break; + } + case ZERO: { + assert isIntArray; + if (isIntArray) { + src = zero_int_src; + } else { + src = zero_a_src; + } + break; + } + } + + for (int i = 0; i < 20000; i++) { + boolean failure = false; + + int p = 0; + + if (params.length > 0) { + if (isIntArray) { + params[0] = ((int[])src).clone(); + } else { + params[0] = ((A[])src).clone(); + } + p++; + } + + if (params.length > 1) { + switch(args.dst()) { + case NEW: { + if (isIntArray) { + params[1] = new int[((int[])params[0]).length]; + } else { + params[1] = new A[((A[])params[0]).length]; + } + p++; + break; + } + case SRC: { + params[1] = params[0]; + p++; + break; + } + case NONE: break; + } + } + + for (int j = 0; j < args.extra_args().length; j++) { + params[p+j] = args.extra_args()[j]; + } + + Object res = m.invoke(null, params); + + if (retType.isPrimitive() && !retType.equals(Void.TYPE)) { + int s = (int)res; + int sum = 0; + int[] int_res = (int[])src; + for (int j = 0; j < int_res.length; j++) { + sum += int_res[j]; + } + failure = (s != sum); + if (failure) { + System.out.println("Test " + name + " failed: result = " + s + " != " + sum); + } + } else { + Object dest = null; + if (!retType.equals(Void.TYPE)) { + dest = res; + } else { + dest = params[1]; + } + + if (m_check != null) { + failure = (boolean)m_check.invoke(null, new Object[] { src, dest }); + } else { + if (isIntArray) { + int[] int_res = (int[])src; + int[] int_dest = (int[])dest; + for (int j = 0; j < int_res.length; j++) { + if (int_res[j] != int_dest[j]) { + System.out.println("Test " + name + " failed for " + j + " src[" + j +"]=" + int_res[j] + ", dest[" + j + "]=" + int_dest[j]); + failure = true; + } + } + } else { + Object[] object_res = (Object[])src; + Object[] object_dest = (Object[])dest; + for (int j = 0; j < object_res.length; j++) { + if (object_res[j] != object_dest[j]) { + System.out.println("Test " + name + " failed for " + j + " src[" + j +"]=" + object_res[j] + ", dest[" + j + "]=" + object_dest[j]); + failure = true; + } + } + } + } + } + + if (failure) { + success = false; + break; + } + } + } + + public static void main(String[] args) throws Exception { + for (int i = 0; i < small_a_src.length; i++) { + small_a_src[i] = new A(); + } + + for (int i = 0; i < small_int_src.length; i++) { + small_int_src[i] = i; + } + + for (int i = 0; i < large_int_src.length; i++) { + large_int_src[i] = i; + } + + for (int i = 0; i < 5; i++) { + small_object_src[i] = new Object(); + } + + TestArrayCopyAsLoadsStores test = new TestArrayCopyAsLoadsStores(); + + test.doTest("m1"); + test.doTest("m2"); + test.doTest("m3"); + test.doTest("m4"); + test.doTest("m5"); + test.doTest("m6"); + test.doTest("m7"); + test.doTest("m8"); + test.doTest("m9"); + test.doTest("m10"); + test.doTest("m11"); + test.doTest("m12"); + test.doTest("m13"); + test.doTest("m14"); + test.doTest("m15"); + + // make both branches of the If appear taken + for (int i = 0; i < 20000; i++) { + helper16(i); + } + + test.doTest("m16"); + + // load class B so type check in m17 would not be simple comparison + B b = new B(); + // make both branches of the If appear taken + for (int i = 0; i < 20000; i++) { + helper17_1(i); + } + + test.doTest("m17"); + + // make both branches of the If appear taken + for (int i = 0; i < 20000; i++) { + helper18_1(i); + } + test.doTest("m18"); + + // make both branches of the If appear taken + for (int i = 0; i < 20000; i++) { + helper19(i); + } + + // Compile + for (int i = 0; i < 20000; i++) { + m19(null, 0); + } + + // force deopt + boolean m19_exception = false; + for (int i = 0; i < 10; i++) { + try { + m19(null, 1); + } catch(ArrayStoreException ase) { + m19_exception = true; + } + } + + if (!m19_exception) { + System.out.println("Test m19: exception wasn't thrown"); + test.success = false; + } + + test.doTest("m19"); + + test.doTest("m20"); + test.doTest("m21"); + + // Compile + int[] dst = new int[small_int_src.length]; + for (int i = 0; i < 20000; i++) { + m22(small_int_src, dst, 0); + } + + // force deopt + for (int i = 0; i < 10; i++) { + try { + m22(small_int_src, dst, 5); + } catch(ArrayIndexOutOfBoundsException aioobe) {} + } + + test.doTest("m22"); + test.doTest("m23"); + + test.doTest("m24"); + boolean m24_exception = false; + try { + m24(small_object_src); + } catch(ArrayStoreException ase) { + m24_exception = true; + } + + if (!m24_exception) { + System.out.println("Test m24: exception wasn't thrown"); + test.success = false; + } + + test.doTest("m25"); + + if (!test.success) { + throw new RuntimeException("some tests failed"); + } + } +} From 58338525b4a746896c4165328d606d2036c1105a Mon Sep 17 00:00:00 2001 From: Tobias Hartmann Date: Mon, 23 Feb 2015 07:55:37 +0100 Subject: [PATCH 34/97] 8072774: bigapps/Weblogic+medrec/nowarnings fails due to CodeHeap 'profiled nmethods' exhaustion Store profiled code in the non-profiled code heap (and vice versa) if the code cache is really full. Reviewed-by: kvn, iveresov --- hotspot/src/share/vm/code/codeCache.cpp | 29 ++++++++++++++++++++----- hotspot/src/share/vm/code/codeCache.hpp | 2 +- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/hotspot/src/share/vm/code/codeCache.cpp b/hotspot/src/share/vm/code/codeCache.cpp index 1d43669209e..5e56fce8cb7 100644 --- a/hotspot/src/share/vm/code/codeCache.cpp +++ b/hotspot/src/share/vm/code/codeCache.cpp @@ -360,7 +360,7 @@ CodeBlob* CodeCache::next_blob(CodeBlob* cb) { * run the constructor for the CodeBlob subclass he is busy * instantiating. */ -CodeBlob* CodeCache::allocate(int size, int code_blob_type) { +CodeBlob* CodeCache::allocate(int size, int code_blob_type, bool strict) { // Possibly wakes up the sweeper thread. NMethodSweeper::notify(code_blob_type); assert_locked_or_safepoint(CodeCache_lock); @@ -379,11 +379,28 @@ CodeBlob* CodeCache::allocate(int size, int code_blob_type) { if (cb != NULL) break; if (!heap->expand_by(CodeCacheExpansionSize)) { // Expansion failed - if (SegmentedCodeCache && (code_blob_type == CodeBlobType::NonNMethod)) { - // Fallback solution: Store non-nmethod code in the non-profiled code heap. - // Note that at in the sweeper, we check the reverse_free_ratio of the non-profiled - // code heap and force stack scanning if less than 10% if the code heap are free. - return allocate(size, CodeBlobType::MethodNonProfiled); + if (SegmentedCodeCache && !strict) { + // Fallback solution: Try to store code in another code heap. + // Note that in the sweeper, we check the reverse_free_ratio of the code heap + // and force stack scanning if less than 10% of the code heap are free. + int type = code_blob_type; + switch (type) { + case CodeBlobType::NonNMethod: + type = CodeBlobType::MethodNonProfiled; + strict = false; // Allow recursive search for other heaps + break; + case CodeBlobType::MethodProfiled: + type = CodeBlobType::MethodNonProfiled; + strict = true; + break; + case CodeBlobType::MethodNonProfiled: + type = CodeBlobType::MethodProfiled; + strict = true; + break; + } + if (heap_available(type)) { + return allocate(size, type, strict); + } } MutexUnlockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag); CompileBroker::handle_full_code_cache(code_blob_type); diff --git a/hotspot/src/share/vm/code/codeCache.hpp b/hotspot/src/share/vm/code/codeCache.hpp index d682f90c5b2..09879b125da 100644 --- a/hotspot/src/share/vm/code/codeCache.hpp +++ b/hotspot/src/share/vm/code/codeCache.hpp @@ -122,7 +122,7 @@ class CodeCache : AllStatic { static void initialize(); // Allocation/administration - static CodeBlob* allocate(int size, int code_blob_type); // allocates a new CodeBlob + static CodeBlob* allocate(int size, int code_blob_type, bool strict = false); // allocates a new CodeBlob static void commit(CodeBlob* cb); // called when the allocated CodeBlob has been filled static int alignment_unit(); // guaranteed alignment of all CodeBlobs static int alignment_offset(); // guaranteed offset of first CodeBlob byte within alignment unit (i.e., allocation header) From 3f7a17902e93db7c156252f470b0ed09b28a68ec Mon Sep 17 00:00:00 2001 From: Volker Simonis Date: Mon, 23 Feb 2015 10:32:17 +0100 Subject: [PATCH 35/97] 8073624: Fix waring "converting to non-pointer type 'bool' from NULL" in arraycopynode.cpp Reviewed-by: roland --- hotspot/src/share/vm/opto/arraycopynode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hotspot/src/share/vm/opto/arraycopynode.cpp b/hotspot/src/share/vm/opto/arraycopynode.cpp index 9c0c4d040ac..755bdfa08bb 100644 --- a/hotspot/src/share/vm/opto/arraycopynode.cpp +++ b/hotspot/src/share/vm/opto/arraycopynode.cpp @@ -455,7 +455,7 @@ bool ArrayCopyNode::finish_transform(PhaseGVN *phase, bool can_reshape, if (in(TypeFunc::Control) != ctl) { // we can't return new memory and control from Ideal at parse time assert(!is_clonebasic(), "added control for clone?"); - return NULL; + return false; } } return true; From 37cfc9fb6d5c1452378b91e137d2cfc92b19347a Mon Sep 17 00:00:00 2001 From: Tobias Hartmann Date: Mon, 23 Feb 2015 10:38:26 +0100 Subject: [PATCH 36/97] 8073257: compiler/codecache/stress/RandomAllocationTest.java + fastdebug + -XX:+LogCompilation, "allocating without ResourceMark" Added two missing ResourceMarks to 'NMethodSweeper::log_sweep'. Reviewed-by: kvn, iignatyev --- hotspot/src/share/vm/runtime/sweeper.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hotspot/src/share/vm/runtime/sweeper.cpp b/hotspot/src/share/vm/runtime/sweeper.cpp index d2a9ff91f96..c059be04e9c 100644 --- a/hotspot/src/share/vm/runtime/sweeper.cpp +++ b/hotspot/src/share/vm/runtime/sweeper.cpp @@ -724,6 +724,7 @@ void NMethodSweeper::possibly_flush(nmethod* nm) { // state of the code cache if it's requested. void NMethodSweeper::log_sweep(const char* msg, const char* format, ...) { if (PrintMethodFlushing) { + ResourceMark rm; stringStream s; // Dump code cache state into a buffer before locking the tty, // because log_state() will use locks causing lock conflicts. @@ -741,6 +742,7 @@ void NMethodSweeper::log_sweep(const char* msg, const char* format, ...) { } if (LogCompilation && (xtty != NULL)) { + ResourceMark rm; stringStream s; // Dump code cache state into a buffer before locking the tty, // because log_state() will use locks causing lock conflicts. From 7fdd3ff35dc252024f26c686c497e30b97dcd423 Mon Sep 17 00:00:00 2001 From: Sergei Kovalev Date: Tue, 24 Feb 2015 16:08:25 +0300 Subject: [PATCH 37/97] 8067162: [TESTBUG] runtime/SharedArchiveFile tests fail on compact profiles Modified TEST.groups file to exclude two tests from execution on compact profiles. Reviewed-by: mseledtsov, dholmes, iignatyev --- hotspot/test/TEST.groups | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hotspot/test/TEST.groups b/hotspot/test/TEST.groups index ad2983d510d..5dad417def7 100644 --- a/hotspot/test/TEST.groups +++ b/hotspot/test/TEST.groups @@ -114,7 +114,9 @@ needs_jre = \ compiler/c2/7047069/Test7047069.java \ runtime/6294277/SourceDebugExtension.java \ runtime/ClassFile/JsrRewriting.java \ - runtime/ClassFile/OomWhileParsingRepeatedJsr.java + runtime/ClassFile/OomWhileParsingRepeatedJsr.java \ + runtime/SharedArchiveFile/LimitSharedSizes.java \ + runtime/SharedArchiveFile/SpaceUtilizationCheck.java # Compact 3 adds further tests to compact2 # From 3d215c0b633e1473f4b24a3e081edb18dd872b51 Mon Sep 17 00:00:00 2001 From: Sergei Kovalev Date: Tue, 24 Feb 2015 15:42:26 +0300 Subject: [PATCH 38/97] 8067822: test/testlibrary_tests/RandomGeneratorTest.java failed on Assert Unexpected random number sequence for mode: NO_SEED On embedded platforms we have a message in std error. We should not take into account the message. Therefore only std out should be used fo verification. Reviewed-by: iignatyev, kvn --- hotspot/test/testlibrary_tests/RandomGeneratorTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hotspot/test/testlibrary_tests/RandomGeneratorTest.java b/hotspot/test/testlibrary_tests/RandomGeneratorTest.java index ff00999e9b9..84103c301f0 100644 --- a/hotspot/test/testlibrary_tests/RandomGeneratorTest.java +++ b/hotspot/test/testlibrary_tests/RandomGeneratorTest.java @@ -58,7 +58,7 @@ public class RandomGeneratorTest { } jvmArgs.add(RandomRunner.class.getName()); String[] cmdLineArgs = jvmArgs.toArray(new String[jvmArgs.size()]); - String etalon = ProcessTools.executeTestJvm(cmdLineArgs).getOutput().trim(); + String etalon = ProcessTools.executeTestJvm(cmdLineArgs).getStdout().trim(); seedOpt.verify(etalon, cmdLineArgs); } @@ -122,7 +122,7 @@ public class RandomGeneratorTest { String lastLineOrig = getLastLine(orig); String lastLine; try { - lastLine = getLastLine(ProcessTools.executeTestJvm(cmdLine).getOutput().trim()); + lastLine = getLastLine(ProcessTools.executeTestJvm(cmdLine).getStdout().trim()); } catch (Throwable t) { throw new Error("TESTBUG: Unexpedted exception during jvm execution.", t); } From f4f9769cd265b759389fcc66283bd4257e87e631 Mon Sep 17 00:00:00 2001 From: Roland Westrelin Date: Tue, 24 Feb 2015 15:23:05 +0100 Subject: [PATCH 39/97] 8073184: Compile of java.lang.Integer::getChars fails with LoopLimitCheck = false after 8054478 CastII that guards counted loops confuses range check elimination with LoopLimitCheck off Reviewed-by: kvn, iveresov --- hotspot/src/share/vm/opto/loopTransform.cpp | 2 +- .../loopopts/TestCastIINoLoopLimitCheck.java | 46 +++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 hotspot/test/compiler/loopopts/TestCastIINoLoopLimitCheck.java diff --git a/hotspot/src/share/vm/opto/loopTransform.cpp b/hotspot/src/share/vm/opto/loopTransform.cpp index f61e335a5c4..d0e31cf142c 100644 --- a/hotspot/src/share/vm/opto/loopTransform.cpp +++ b/hotspot/src/share/vm/opto/loopTransform.cpp @@ -2032,7 +2032,7 @@ void PhaseIdealLoop::do_range_check( IdealLoopTree *loop, Node_List &old_new ) { // Hopefully, compiler will optimize for powers of 2. Node *ctrl = get_ctrl(main_limit); Node *stride = cl->stride(); - Node *init = cl->init_trip(); + Node *init = cl->init_trip()->uncast(); Node *span = new SubINode(main_limit,init); register_new_node(span,ctrl); Node *rndup = _igvn.intcon(stride_con + ((stride_con>0)?-1:1)); diff --git a/hotspot/test/compiler/loopopts/TestCastIINoLoopLimitCheck.java b/hotspot/test/compiler/loopopts/TestCastIINoLoopLimitCheck.java new file mode 100644 index 00000000000..c9c985ab4ac --- /dev/null +++ b/hotspot/test/compiler/loopopts/TestCastIINoLoopLimitCheck.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +/** + * @test + * @bug 8073184 + * @summary CastII that guards counted loops confuses range check elimination with LoopLimitCheck off + * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-LoopLimitCheck -XX:CompileOnly=TestCastIINoLoopLimitCheck.m -Xcomp TestCastIINoLoopLimitCheck + * + */ + +public class TestCastIINoLoopLimitCheck { + + static void m(int i, int index, char[] buf) { + while (i >= 65536) { + i = i / 100; + buf [--index] = 0; + buf [--index] = 1; + } + } + + static public void main(String[] args) { + m(0, 0, null); + } +} From 14cf940405fdb91c2915b4af54206e52c4f51a31 Mon Sep 17 00:00:00 2001 From: Igor Veresov Date: Tue, 24 Feb 2015 23:31:00 -0800 Subject: [PATCH 40/97] 8073735: compiler/loopopts/CountedLoopProblem.java got OOME Ignore OOM in the test Reviewed-by: kvn --- .../compiler/loopopts/CountedLoopProblem.java | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/hotspot/test/compiler/loopopts/CountedLoopProblem.java b/hotspot/test/compiler/loopopts/CountedLoopProblem.java index da206cb86d3..23cc0bb39e6 100644 --- a/hotspot/test/compiler/loopopts/CountedLoopProblem.java +++ b/hotspot/test/compiler/loopopts/CountedLoopProblem.java @@ -36,18 +36,22 @@ public class CountedLoopProblem { public static void main(String[] args) throws Exception { Random r = new Random(42); int x = 0; - StringBuilder sb = new StringBuilder(); - for(int i = 0; i < 1000000; ++i) { - int v = Math.abs(r.nextInt()); - sb.append('+').append(v).append('\n'); - x += v; - // To trigger the problem we must OSR in the following loop - // To make the problem 100% reproducible run with -XX:-TieredCompilation -XX:OSROnlyBCI=62 - while(x < 0) x += 1000000000; - sb.append('=').append(x).append('\n'); - } - if (sb.toString().hashCode() != 0xaba94591) { - throw new Exception("Unexpected result"); + try { + StringBuilder sb = new StringBuilder(); + for(int i = 0; i < 1000000; ++i) { + int v = Math.abs(r.nextInt()); + sb.append('+').append(v).append('\n'); + x += v; + // To trigger the problem we must OSR in the following loop + // To make the problem 100% reproducible run with -XX:-TieredCompilation -XX:OSROnlyBCI=62 + while(x < 0) x += 1000000000; + sb.append('=').append(x).append('\n'); + } + if (sb.toString().hashCode() != 0xaba94591) { + throw new Exception("Unexpected result"); + } + } catch(OutOfMemoryError e) { + // small heap, ignore } } } From 942d1f7f328cb7afd0a0d1717f95d1f6acba22bd Mon Sep 17 00:00:00 2001 From: Serguei Spitsyn Date: Wed, 25 Feb 2015 00:30:54 -0800 Subject: [PATCH 41/97] 8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale Optimize the adjust_method_entries functions by using the orig_method_idnum() function Reviewed-by: coleenp, dcubed --- .../src/share/vm/classfile/defaultMethods.cpp | 3 +- hotspot/src/share/vm/oops/constMethod.hpp | 6 +- hotspot/src/share/vm/oops/cpCache.cpp | 48 ++++--- hotspot/src/share/vm/oops/cpCache.hpp | 9 +- hotspot/src/share/vm/oops/instanceKlass.cpp | 43 +++--- hotspot/src/share/vm/oops/instanceKlass.hpp | 3 +- hotspot/src/share/vm/oops/klassVtable.cpp | 123 +++++++++--------- hotspot/src/share/vm/oops/klassVtable.hpp | 8 +- hotspot/src/share/vm/oops/method.cpp | 1 + hotspot/src/share/vm/oops/method.hpp | 5 +- .../share/vm/prims/jvmtiRedefineClasses.cpp | 37 +++--- 11 files changed, 154 insertions(+), 132 deletions(-) diff --git a/hotspot/src/share/vm/classfile/defaultMethods.cpp b/hotspot/src/share/vm/classfile/defaultMethods.cpp index 65a38fe037c..5cc8a6844ae 100644 --- a/hotspot/src/share/vm/classfile/defaultMethods.cpp +++ b/hotspot/src/share/vm/classfile/defaultMethods.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1091,6 +1091,7 @@ static void merge_in_new_methods(InstanceKlass* klass, } // update idnum for new location merged_methods->at(i)->set_method_idnum(i); + merged_methods->at(i)->set_orig_method_idnum(i); } // Verify correct order diff --git a/hotspot/src/share/vm/oops/constMethod.hpp b/hotspot/src/share/vm/oops/constMethod.hpp index 3f3ae19ea01..f5b19fe7758 100644 --- a/hotspot/src/share/vm/oops/constMethod.hpp +++ b/hotspot/src/share/vm/oops/constMethod.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -215,6 +215,7 @@ private: u2 _max_stack; // Maximum number of entries on the expression stack u2 _max_locals; // Number of local variables used by this method u2 _size_of_parameters; // size of the parameter block (receiver + arguments) in words + u2 _orig_method_idnum; // Original unique identification number for the method // Constructor ConstMethod(int byte_code_size, @@ -473,6 +474,9 @@ public: u2 method_idnum() const { return _method_idnum; } void set_method_idnum(u2 idnum) { _method_idnum = idnum; } + u2 orig_method_idnum() const { return _orig_method_idnum; } + void set_orig_method_idnum(u2 idnum) { _orig_method_idnum = idnum; } + // max stack int max_stack() const { return _max_stack; } void set_max_stack(int size) { _max_stack = size; } diff --git a/hotspot/src/share/vm/oops/cpCache.cpp b/hotspot/src/share/vm/oops/cpCache.cpp index 990d9391d1c..81694539ced 100644 --- a/hotspot/src/share/vm/oops/cpCache.cpp +++ b/hotspot/src/share/vm/oops/cpCache.cpp @@ -455,7 +455,6 @@ bool ConstantPoolCacheEntry::adjust_method_entry(Method* old_method, new_method->name()->as_C_string(), new_method->signature()->as_C_string())); } - return true; } @@ -483,7 +482,6 @@ bool ConstantPoolCacheEntry::adjust_method_entry(Method* old_method, new_method->name()->as_C_string(), new_method->signature()->as_C_string())); } - return true; } @@ -510,36 +508,33 @@ bool ConstantPoolCacheEntry::check_no_old_or_obsolete_entries() { (!f1_as_method()->is_old() && !f1_as_method()->is_obsolete()))); } -bool ConstantPoolCacheEntry::is_interesting_method_entry(Klass* k) { +Method* ConstantPoolCacheEntry::get_interesting_method_entry(Klass* k) { if (!is_method_entry()) { // not a method entry so not interesting by default - return false; + return NULL; } - Method* m = NULL; if (is_vfinal()) { // virtual and final so _f2 contains method ptr instead of vtable index m = f2_as_vfinal_method(); } else if (is_f1_null()) { // NULL _f1 means this is a virtual entry so also not interesting - return false; + return NULL; } else { if (!(_f1->is_method())) { // _f1 can also contain a Klass* for an interface - return false; + return NULL; } m = f1_as_method(); } - assert(m != NULL && m->is_method(), "sanity check"); if (m == NULL || !m->is_method() || (k != NULL && m->method_holder() != k)) { // robustness for above sanity checks or method is not in // the interesting class - return false; + return NULL; } - // the method is in the interesting class so the entry is interesting - return true; + return m; } #endif // INCLUDE_JVMTI @@ -616,7 +611,7 @@ void ConstantPoolCache::initialize(const intArray& inverse_index_map, // If any entry of this ConstantPoolCache points to any of // old_methods, replace it with the corresponding new_method. void ConstantPoolCache::adjust_method_entries(Method** old_methods, Method** new_methods, - int methods_length, bool * trace_name_printed) { + int methods_length, bool * trace_name_printed) { if (methods_length == 0) { // nothing to do if there are no methods @@ -627,7 +622,7 @@ void ConstantPoolCache::adjust_method_entries(Method** old_methods, Method** new Klass* old_holder = old_methods[0]->method_holder(); for (int i = 0; i < length(); i++) { - if (!entry_at(i)->is_interesting_method_entry(old_holder)) { + if (entry_at(i)->get_interesting_method_entry(old_holder) == NULL) { // skip uninteresting methods continue; } @@ -651,10 +646,33 @@ void ConstantPoolCache::adjust_method_entries(Method** old_methods, Method** new } } +// If any entry of this ConstantPoolCache points to any of +// old_methods, replace it with the corresponding new_method. +void ConstantPoolCache::adjust_method_entries(InstanceKlass* holder, bool * trace_name_printed) { + for (int i = 0; i < length(); i++) { + ConstantPoolCacheEntry* entry = entry_at(i); + Method* old_method = entry->get_interesting_method_entry(holder); + if (old_method == NULL || !old_method->is_old()) { + continue; // skip uninteresting entries + } + if (old_method->is_deleted()) { + // clean up entries with deleted methods + entry->initialize_entry(entry->constant_pool_index()); + continue; + } + Method* new_method = holder->method_with_idnum(old_method->orig_method_idnum()); + + assert(new_method != NULL, "method_with_idnum() should not be NULL"); + assert(old_method != new_method, "sanity check"); + + entry_at(i)->adjust_method_entry(old_method, new_method, trace_name_printed); + } +} + // the constant pool cache should never contain old or obsolete methods bool ConstantPoolCache::check_no_old_or_obsolete_entries() { for (int i = 1; i < length(); i++) { - if (entry_at(i)->is_interesting_method_entry(NULL) && + if (entry_at(i)->get_interesting_method_entry(NULL) != NULL && !entry_at(i)->check_no_old_or_obsolete_entries()) { return false; } @@ -664,7 +682,7 @@ bool ConstantPoolCache::check_no_old_or_obsolete_entries() { void ConstantPoolCache::dump_cache() { for (int i = 1; i < length(); i++) { - if (entry_at(i)->is_interesting_method_entry(NULL)) { + if (entry_at(i)->get_interesting_method_entry(NULL) != NULL) { entry_at(i)->print(tty, i); } } diff --git a/hotspot/src/share/vm/oops/cpCache.hpp b/hotspot/src/share/vm/oops/cpCache.hpp index debd09136c7..eeef44f653c 100644 --- a/hotspot/src/share/vm/oops/cpCache.hpp +++ b/hotspot/src/share/vm/oops/cpCache.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -379,9 +379,9 @@ class ConstantPoolCacheEntry VALUE_OBJ_CLASS_SPEC { // printed the klass name so that other routines in the adjust_* // group don't print the klass name. bool adjust_method_entry(Method* old_method, Method* new_method, - bool * trace_name_printed); + bool* trace_name_printed); bool check_no_old_or_obsolete_entries(); - bool is_interesting_method_entry(Klass* k); + Method* get_interesting_method_entry(Klass* k); #endif // INCLUDE_JVMTI // Debugging & Printing @@ -478,7 +478,8 @@ class ConstantPoolCache: public MetaspaceObj { // printed the klass name so that other routines in the adjust_* // group don't print the klass name. void adjust_method_entries(Method** old_methods, Method** new_methods, - int methods_length, bool * trace_name_printed); + int methods_length, bool* trace_name_printed); + void adjust_method_entries(InstanceKlass* holder, bool* trace_name_printed); bool check_no_old_or_obsolete_entries(); void dump_cache(); #endif // INCLUDE_JVMTI diff --git a/hotspot/src/share/vm/oops/instanceKlass.cpp b/hotspot/src/share/vm/oops/instanceKlass.cpp index ce0fb5de7c3..91843cdb2f5 100644 --- a/hotspot/src/share/vm/oops/instanceKlass.cpp +++ b/hotspot/src/share/vm/oops/instanceKlass.cpp @@ -2793,30 +2793,33 @@ Method* InstanceKlass::method_at_itable(Klass* holder, int index, TRAPS) { // not yet in the vtable due to concurrent subclass define and superinterface // redefinition // Note: those in the vtable, should have been updated via adjust_method_entries -void InstanceKlass::adjust_default_methods(Method** old_methods, Method** new_methods, - int methods_length, bool* trace_name_printed) { +void InstanceKlass::adjust_default_methods(InstanceKlass* holder, bool* trace_name_printed) { // search the default_methods for uses of either obsolete or EMCP methods if (default_methods() != NULL) { - for (int j = 0; j < methods_length; j++) { - Method* old_method = old_methods[j]; - Method* new_method = new_methods[j]; + for (int index = 0; index < default_methods()->length(); index ++) { + Method* old_method = default_methods()->at(index); + if (old_method == NULL || old_method->method_holder() != holder || !old_method->is_old()) { + continue; // skip uninteresting entries + } + assert(!old_method->is_deleted(), "default methods may not be deleted"); - for (int index = 0; index < default_methods()->length(); index ++) { - if (default_methods()->at(index) == old_method) { - default_methods()->at_put(index, new_method); - if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) { - if (!(*trace_name_printed)) { - // RC_TRACE_MESG macro has an embedded ResourceMark - RC_TRACE_MESG(("adjust: klassname=%s default methods from name=%s", - external_name(), - old_method->method_holder()->external_name())); - *trace_name_printed = true; - } - RC_TRACE(0x00100000, ("default method update: %s(%s) ", - new_method->name()->as_C_string(), - new_method->signature()->as_C_string())); - } + Method* new_method = holder->method_with_idnum(old_method->orig_method_idnum()); + + assert(new_method != NULL, "method_with_idnum() should not be NULL"); + assert(old_method != new_method, "sanity check"); + + default_methods()->at_put(index, new_method); + if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) { + if (!(*trace_name_printed)) { + // RC_TRACE_MESG macro has an embedded ResourceMark + RC_TRACE_MESG(("adjust: klassname=%s default methods from name=%s", + external_name(), + old_method->method_holder()->external_name())); + *trace_name_printed = true; } + RC_TRACE(0x00100000, ("default method update: %s(%s) ", + new_method->name()->as_C_string(), + new_method->signature()->as_C_string())); } } } diff --git a/hotspot/src/share/vm/oops/instanceKlass.hpp b/hotspot/src/share/vm/oops/instanceKlass.hpp index 5cbe4a824bb..507454e18b9 100644 --- a/hotspot/src/share/vm/oops/instanceKlass.hpp +++ b/hotspot/src/share/vm/oops/instanceKlass.hpp @@ -937,8 +937,7 @@ class InstanceKlass: public Klass { Method* method_at_itable(Klass* holder, int index, TRAPS); #if INCLUDE_JVMTI - void adjust_default_methods(Method** old_methods, Method** new_methods, - int methods_length, bool* trace_name_printed); + void adjust_default_methods(InstanceKlass* holder, bool* trace_name_printed); #endif // INCLUDE_JVMTI // Garbage collection diff --git a/hotspot/src/share/vm/oops/klassVtable.cpp b/hotspot/src/share/vm/oops/klassVtable.cpp index a50b77ce27d..047ea647a08 100644 --- a/hotspot/src/share/vm/oops/klassVtable.cpp +++ b/hotspot/src/share/vm/oops/klassVtable.cpp @@ -864,44 +864,43 @@ bool klassVtable::adjust_default_method(int vtable_index, Method* old_method, Me } return updated; } -void klassVtable::adjust_method_entries(Method** old_methods, Method** new_methods, - int methods_length, bool * trace_name_printed) { - // search the vtable for uses of either obsolete or EMCP methods - for (int j = 0; j < methods_length; j++) { - Method* old_method = old_methods[j]; - Method* new_method = new_methods[j]; - // In the vast majority of cases we could get the vtable index - // by using: old_method->vtable_index() - // However, there are rare cases, eg. sun.awt.X11.XDecoratedPeer.getX() - // in sun.awt.X11.XFramePeer where methods occur more than once in the - // vtable, so, alas, we must do an exhaustive search. - for (int index = 0; index < length(); index++) { - if (unchecked_method_at(index) == old_method) { - put_method_at(new_method, index); - // For default methods, need to update the _default_methods array - // which can only have one method entry for a given signature - bool updated_default = false; - if (old_method->is_default_method()) { - updated_default = adjust_default_method(index, old_method, new_method); - } +// search the vtable for uses of either obsolete or EMCP methods +void klassVtable::adjust_method_entries(InstanceKlass* holder, bool * trace_name_printed) { + int prn_enabled = 0; + for (int index = 0; index < length(); index++) { + Method* old_method = unchecked_method_at(index); + if (old_method == NULL || old_method->method_holder() != holder || !old_method->is_old()) { + continue; // skip uninteresting entries + } + assert(!old_method->is_deleted(), "vtable methods may not be deleted"); - if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) { - if (!(*trace_name_printed)) { - // RC_TRACE_MESG macro has an embedded ResourceMark - RC_TRACE_MESG(("adjust: klassname=%s for methods from name=%s", - klass()->external_name(), - old_method->method_holder()->external_name())); - *trace_name_printed = true; - } - // RC_TRACE macro has an embedded ResourceMark - RC_TRACE(0x00100000, ("vtable method update: %s(%s), updated default = %s", - new_method->name()->as_C_string(), - new_method->signature()->as_C_string(), - updated_default ? "true" : "false")); - } - // cannot 'break' here; see for-loop comment above. + Method* new_method = holder->method_with_idnum(old_method->orig_method_idnum()); + + assert(new_method != NULL, "method_with_idnum() should not be NULL"); + assert(old_method != new_method, "sanity check"); + + put_method_at(new_method, index); + // For default methods, need to update the _default_methods array + // which can only have one method entry for a given signature + bool updated_default = false; + if (old_method->is_default_method()) { + updated_default = adjust_default_method(index, old_method, new_method); + } + + if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) { + if (!(*trace_name_printed)) { + // RC_TRACE_MESG macro has an embedded ResourceMark + RC_TRACE_MESG(("adjust: klassname=%s for methods from name=%s", + klass()->external_name(), + old_method->method_holder()->external_name())); + *trace_name_printed = true; } + // RC_TRACE macro has an embedded ResourceMark + RC_TRACE(0x00100000, ("vtable method update: %s(%s), updated default = %s", + new_method->name()->as_C_string(), + new_method->signature()->as_C_string(), + updated_default ? "true" : "false")); } } } @@ -1194,37 +1193,35 @@ void klassItable::initialize_with_method(Method* m) { } #if INCLUDE_JVMTI -void klassItable::adjust_method_entries(Method** old_methods, Method** new_methods, - int methods_length, bool * trace_name_printed) { - // search the itable for uses of either obsolete or EMCP methods - for (int j = 0; j < methods_length; j++) { - Method* old_method = old_methods[j]; - Method* new_method = new_methods[j]; - itableMethodEntry* ime = method_entry(0); +// search the itable for uses of either obsolete or EMCP methods +void klassItable::adjust_method_entries(InstanceKlass* holder, bool * trace_name_printed) { - // The itable can describe more than one interface and the same - // method signature can be specified by more than one interface. - // This means we have to do an exhaustive search to find all the - // old_method references. - for (int i = 0; i < _size_method_table; i++) { - if (ime->method() == old_method) { - ime->initialize(new_method); + itableMethodEntry* ime = method_entry(0); + for (int i = 0; i < _size_method_table; i++, ime++) { + Method* old_method = ime->method(); + if (old_method == NULL || old_method->method_holder() != holder || !old_method->is_old()) { + continue; // skip uninteresting entries + } + assert(!old_method->is_deleted(), "itable methods may not be deleted"); - if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) { - if (!(*trace_name_printed)) { - // RC_TRACE_MESG macro has an embedded ResourceMark - RC_TRACE_MESG(("adjust: name=%s", - old_method->method_holder()->external_name())); - *trace_name_printed = true; - } - // RC_TRACE macro has an embedded ResourceMark - RC_TRACE(0x00200000, ("itable method update: %s(%s)", - new_method->name()->as_C_string(), - new_method->signature()->as_C_string())); - } - // cannot 'break' here; see for-loop comment above. + Method* new_method = holder->method_with_idnum(old_method->orig_method_idnum()); + + assert(new_method != NULL, "method_with_idnum() should not be NULL"); + assert(old_method != new_method, "sanity check"); + + ime->initialize(new_method); + + if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) { + if (!(*trace_name_printed)) { + // RC_TRACE_MESG macro has an embedded ResourceMark + RC_TRACE_MESG(("adjust: name=%s", + old_method->method_holder()->external_name())); + *trace_name_printed = true; } - ime++; + // RC_TRACE macro has an embedded ResourceMark + RC_TRACE(0x00200000, ("itable method update: %s(%s)", + new_method->name()->as_C_string(), + new_method->signature()->as_C_string())); } } } diff --git a/hotspot/src/share/vm/oops/klassVtable.hpp b/hotspot/src/share/vm/oops/klassVtable.hpp index 01ad63fcfa0..e4b4c9f5141 100644 --- a/hotspot/src/share/vm/oops/klassVtable.hpp +++ b/hotspot/src/share/vm/oops/klassVtable.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -98,8 +98,7 @@ class klassVtable : public ResourceObj { // printed the klass name so that other routines in the adjust_* // group don't print the klass name. bool adjust_default_method(int vtable_index, Method* old_method, Method* new_method); - void adjust_method_entries(Method** old_methods, Method** new_methods, - int methods_length, bool * trace_name_printed); + void adjust_method_entries(InstanceKlass* holder, bool * trace_name_printed); bool check_no_old_or_obsolete_entries(); void dump_vtable(); #endif // INCLUDE_JVMTI @@ -288,8 +287,7 @@ class klassItable : public ResourceObj { // trace_name_printed is set to true if the current call has // printed the klass name so that other routines in the adjust_* // group don't print the klass name. - void adjust_method_entries(Method** old_methods, Method** new_methods, - int methods_length, bool * trace_name_printed); + void adjust_method_entries(InstanceKlass* holder, bool * trace_name_printed); bool check_no_old_or_obsolete_entries(); void dump_itable(); #endif // INCLUDE_JVMTI diff --git a/hotspot/src/share/vm/oops/method.cpp b/hotspot/src/share/vm/oops/method.cpp index 9e37b0b8504..ac0a422b83d 100644 --- a/hotspot/src/share/vm/oops/method.cpp +++ b/hotspot/src/share/vm/oops/method.cpp @@ -1450,6 +1450,7 @@ void Method::sort_methods(Array* methods, bool idempotent, bool set_idn for (int i = 0; i < length; i++) { Method* m = methods->at(i); m->set_method_idnum(i); + m->set_orig_method_idnum(i); } } } diff --git a/hotspot/src/share/vm/oops/method.hpp b/hotspot/src/share/vm/oops/method.hpp index 8b279341dc8..d87864a7704 100644 --- a/hotspot/src/share/vm/oops/method.hpp +++ b/hotspot/src/share/vm/oops/method.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -233,6 +233,9 @@ class Method : public Metadata { u2 method_idnum() const { return constMethod()->method_idnum(); } void set_method_idnum(u2 idnum) { constMethod()->set_method_idnum(idnum); } + u2 orig_method_idnum() const { return constMethod()->orig_method_idnum(); } + void set_orig_method_idnum(u2 idnum) { constMethod()->set_orig_method_idnum(idnum); } + // code size int code_size() const { return constMethod()->code_size(); } diff --git a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp b/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp index 50c38069e1a..b5e5f64806f 100644 --- a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp +++ b/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp @@ -782,9 +782,13 @@ jvmtiError VM_RedefineClasses::compare_and_normalize_class_versions( Method* idnum_owner = scratch_class->method_with_idnum(old_num); if (idnum_owner != NULL) { // There is already a method assigned this idnum -- switch them + // Take current and original idnum from the new_method idnum_owner->set_method_idnum(new_num); + idnum_owner->set_orig_method_idnum(k_new_method->orig_method_idnum()); } + // Take current and original idnum from the old_method k_new_method->set_method_idnum(old_num); + k_new_method->set_orig_method_idnum(k_old_method->orig_method_idnum()); if (thread->has_pending_exception()) { return JVMTI_ERROR_OUT_OF_MEMORY; } @@ -817,9 +821,12 @@ jvmtiError VM_RedefineClasses::compare_and_normalize_class_versions( Method* idnum_owner = scratch_class->method_with_idnum(num); if (idnum_owner != NULL) { // There is already a method assigned this idnum -- switch them + // Take current and original idnum from the new_method idnum_owner->set_method_idnum(new_num); + idnum_owner->set_orig_method_idnum(k_new_method->orig_method_idnum()); } k_new_method->set_method_idnum(num); + k_new_method->set_orig_method_idnum(num); if (thread->has_pending_exception()) { return JVMTI_ERROR_OUT_OF_MEMORY; } @@ -3327,6 +3334,7 @@ void VM_RedefineClasses::AdjustCpoolCacheAndVtable::do_klass(Klass* k) { // This is a very busy routine. We don't want too much tracing // printed out. bool trace_name_printed = false; + InstanceKlass *the_class = InstanceKlass::cast(_the_class_oop); // Very noisy: only enable this call if you are trying to determine // that a specific class gets found by this routine. @@ -3338,10 +3346,8 @@ void VM_RedefineClasses::AdjustCpoolCacheAndVtable::do_klass(Klass* k) { // If the class being redefined is java.lang.Object, we need to fix all // array class vtables also if (k->oop_is_array() && _the_class_oop == SystemDictionary::Object_klass()) { - k->vtable()->adjust_method_entries(_matching_old_methods, - _matching_new_methods, - _matching_methods_length, - &trace_name_printed); + k->vtable()->adjust_method_entries(the_class, &trace_name_printed); + } else if (k->oop_is_instance()) { HandleMark hm(_thread); InstanceKlass *ik = InstanceKlass::cast(k); @@ -3383,14 +3389,9 @@ void VM_RedefineClasses::AdjustCpoolCacheAndVtable::do_klass(Klass* k) { || ik->is_subtype_of(_the_class_oop))) { // ik->vtable() creates a wrapper object; rm cleans it up ResourceMark rm(_thread); - ik->vtable()->adjust_method_entries(_matching_old_methods, - _matching_new_methods, - _matching_methods_length, - &trace_name_printed); - ik->adjust_default_methods(_matching_old_methods, - _matching_new_methods, - _matching_methods_length, - &trace_name_printed); + + ik->vtable()->adjust_method_entries(the_class, &trace_name_printed); + ik->adjust_default_methods(the_class, &trace_name_printed); } // If the current class has an itable and we are either redefining an @@ -3405,10 +3406,8 @@ void VM_RedefineClasses::AdjustCpoolCacheAndVtable::do_klass(Klass* k) { || ik->is_subclass_of(_the_class_oop))) { // ik->itable() creates a wrapper object; rm cleans it up ResourceMark rm(_thread); - ik->itable()->adjust_method_entries(_matching_old_methods, - _matching_new_methods, - _matching_methods_length, - &trace_name_printed); + + ik->itable()->adjust_method_entries(the_class, &trace_name_printed); } // The constant pools in other classes (other_cp) can refer to @@ -3432,10 +3431,7 @@ void VM_RedefineClasses::AdjustCpoolCacheAndVtable::do_klass(Klass* k) { other_cp = constantPoolHandle(ik->constants()); cp_cache = other_cp->cache(); if (cp_cache != NULL) { - cp_cache->adjust_method_entries(_matching_old_methods, - _matching_new_methods, - _matching_methods_length, - &trace_name_printed); + cp_cache->adjust_method_entries(the_class, &trace_name_printed); } } @@ -3578,6 +3574,7 @@ int VM_RedefineClasses::check_methods_and_mark_as_obsolete() { // obsolete methods need a unique idnum so they become new entries in // the jmethodID cache in InstanceKlass + assert(old_method->method_idnum() == new_method->method_idnum(), "must match"); u2 num = InstanceKlass::cast(_the_class_oop)->next_method_idnum(); if (num != ConstMethod::UNSET_IDNUM) { old_method->set_method_idnum(num); From 3a627c0d835d97d2364dbe6964d5b42afb30ad21 Mon Sep 17 00:00:00 2001 From: Roland Westrelin Date: Wed, 25 Feb 2015 10:44:38 +0100 Subject: [PATCH 42/97] 8073792: assert((get_length_if_constant(phase) == -1) == !ary_src->size()->is_con()) failed: inconsistent Assert in array copy code broken when array size becomes known during igvn Reviewed-by: kvn, vlivanov --- hotspot/src/share/vm/opto/arraycopynode.cpp | 3 +- .../arraycopy/TestArrayCloneBadAssert.java | 50 +++++++++++++++++++ .../arraycopy/TestArrayCopyAsLoadsStores.java | 5 +- 3 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 hotspot/test/compiler/arraycopy/TestArrayCloneBadAssert.java diff --git a/hotspot/src/share/vm/opto/arraycopynode.cpp b/hotspot/src/share/vm/opto/arraycopynode.cpp index 755bdfa08bb..c14e6ee6ee5 100644 --- a/hotspot/src/share/vm/opto/arraycopynode.cpp +++ b/hotspot/src/share/vm/opto/arraycopynode.cpp @@ -121,7 +121,8 @@ int ArrayCopyNode::get_count(PhaseGVN *phase) const { // length input to ArrayCopyNode is constant, length of input // array must be too. - assert((get_length_if_constant(phase) == -1) == !ary_src->size()->is_con(), "inconsistent"); + assert((get_length_if_constant(phase) == -1) == !ary_src->size()->is_con() || + phase->is_IterGVN(), "inconsistent"); if (ary_src->size()->is_con()) { return ary_src->size()->get_con(); diff --git a/hotspot/test/compiler/arraycopy/TestArrayCloneBadAssert.java b/hotspot/test/compiler/arraycopy/TestArrayCloneBadAssert.java new file mode 100644 index 00000000000..a6033337885 --- /dev/null +++ b/hotspot/test/compiler/arraycopy/TestArrayCloneBadAssert.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8073792 + * @summary assert broken when array size becomes known during igvn + * @run main/othervm -Xcomp -XX:CompileOnly=TestArrayCloneBadAssert.m TestArrayCloneBadAssert + * + */ + +public class TestArrayCloneBadAssert { + + static final int[] array = new int[5]; + + static int[] m(int[] arr) { + int i = 0; + for (; i < 2; i++) { + } + if (i == 2) { + arr = array; + } + return arr.clone(); + } + + static public void main(String[] args) { + int[] arr = new int[5]; + m(arr); + } +} diff --git a/hotspot/test/compiler/arraycopy/TestArrayCopyAsLoadsStores.java b/hotspot/test/compiler/arraycopy/TestArrayCopyAsLoadsStores.java index f1ea4c2368a..05549106f0c 100644 --- a/hotspot/test/compiler/arraycopy/TestArrayCopyAsLoadsStores.java +++ b/hotspot/test/compiler/arraycopy/TestArrayCopyAsLoadsStores.java @@ -25,8 +25,8 @@ * @test * @bug 6912521 * @summary small array copy as loads/stores - * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:CompileCommand=dontinline,TestArrayCopyAsLoadsStores::m* -XX:TypeProfileLevel=200 TestArrayCopyAsLoadsStores - * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:CompileCommand=dontinline,TestArrayCopyAsLoadsStores::m* -XX:+IgnoreUnrecognizedVMOptions -XX:+StressArrayCopyMacroNode -XX:TypeProfileLevel=200 TestArrayCopyAsLoadsStores + * @run main/othervm -ea -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:CompileCommand=dontinline,TestArrayCopyAsLoadsStores::m* -XX:TypeProfileLevel=200 TestArrayCopyAsLoadsStores + * @run main/othervm -ea -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:CompileCommand=dontinline,TestArrayCopyAsLoadsStores::m* -XX:+IgnoreUnrecognizedVMOptions -XX:+StressArrayCopyMacroNode -XX:TypeProfileLevel=200 TestArrayCopyAsLoadsStores * */ @@ -392,7 +392,6 @@ public class TestArrayCopyAsLoadsStores { break; } case ZERO: { - assert isIntArray; if (isIntArray) { src = zero_int_src; } else { From 292cc7354655736b3318375f3e1362ab9adef3fd Mon Sep 17 00:00:00 2001 From: Stefan Anzinger Date: Fri, 27 Feb 2015 13:21:05 +0100 Subject: [PATCH 43/97] 8073670: TypeF::eq and TypeD::eq do not handle NaNs correctly Change TypeF:eq and TypeD:eq to compare NaN values using a bitwise comparison. Reviewed-by: kvn --- hotspot/src/share/vm/opto/type.cpp | 38 +--- .../compiler/c2/FloatingPointFoldingTest.java | 163 ++++++++++++++++++ 2 files changed, 171 insertions(+), 30 deletions(-) create mode 100644 hotspot/test/compiler/c2/FloatingPointFoldingTest.java diff --git a/hotspot/src/share/vm/opto/type.cpp b/hotspot/src/share/vm/opto/type.cpp index aa28426eaad..a6e95fe92c7 100644 --- a/hotspot/src/share/vm/opto/type.cpp +++ b/hotspot/src/share/vm/opto/type.cpp @@ -974,21 +974,10 @@ const Type *TypeF::xdual() const { //------------------------------eq--------------------------------------------- // Structural equality check for Type representations -bool TypeF::eq( const Type *t ) const { - if( g_isnan(_f) || - g_isnan(t->getf()) ) { - // One or both are NANs. If both are NANs return true, else false. - return (g_isnan(_f) && g_isnan(t->getf())); - } - if (_f == t->getf()) { - // (NaN is impossible at this point, since it is not equal even to itself) - if (_f == 0.0) { - // difference between positive and negative zero - if (jint_cast(_f) != jint_cast(t->getf())) return false; - } - return true; - } - return false; +bool TypeF::eq(const Type *t) const { + // Bitwise comparison to distinguish between +/-0. These values must be treated + // as different to be consistent with C1 and the interpreter. + return (jint_cast(_f) == jint_cast(t->getf())); } //------------------------------hash------------------------------------------- @@ -1089,21 +1078,10 @@ const Type *TypeD::xdual() const { //------------------------------eq--------------------------------------------- // Structural equality check for Type representations -bool TypeD::eq( const Type *t ) const { - if( g_isnan(_d) || - g_isnan(t->getd()) ) { - // One or both are NANs. If both are NANs return true, else false. - return (g_isnan(_d) && g_isnan(t->getd())); - } - if (_d == t->getd()) { - // (NaN is impossible at this point, since it is not equal even to itself) - if (_d == 0.0) { - // difference between positive and negative zero - if (jlong_cast(_d) != jlong_cast(t->getd())) return false; - } - return true; - } - return false; +bool TypeD::eq(const Type *t) const { + // Bitwise comparison to distinguish between +/-0. These values must be treated + // as different to be consistent with C1 and the interpreter. + return (jlong_cast(_d) == jlong_cast(t->getd())); } //------------------------------hash------------------------------------------- diff --git a/hotspot/test/compiler/c2/FloatingPointFoldingTest.java b/hotspot/test/compiler/c2/FloatingPointFoldingTest.java new file mode 100644 index 00000000000..cb3ce01c96b --- /dev/null +++ b/hotspot/test/compiler/c2/FloatingPointFoldingTest.java @@ -0,0 +1,163 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +/** + * @test + * @bug 8073670 + * @summary Test that causes C2 to fold two NaNs with different values into a single NaN. + * @run main/othervm -XX:-TieredCompilation -Xcomp -XX:CompileCommand=compileonly,FloatingPointFoldingTest.test_double_inf -XX:CompileCommand=compileonly,FloatingPointFoldingTest.test_double_zero -XX:CompileCommand=compileonly,FloatingPointFoldingTest.test_double_nan -XX:CompileCommand=compileonly,FloatingPointFoldingTest.test_float_inf -XX:CompileCommand=compileonly,FloatingPointFoldingTest.test_float_zero -XX:CompileCommand=compileonly,FloatingPointFoldingTest.test_float_nan FloatingPointFoldingTest + */ + +public class FloatingPointFoldingTest { + // Double values. + public static final long MINUS_INF_LONGBITS = 0xfff0000000000000L; + public static final double DOUBLE_MINUS_INF = Double.longBitsToDouble(MINUS_INF_LONGBITS); + + public static final long PLUS_INF_LONGBITS = 0x7ff0000000000000L; + public static final double DOUBLE_PLUS_INF = Double.longBitsToDouble(PLUS_INF_LONGBITS); + + public static final long MINUS_ZERO_LONGBITS = 0x8000000000000000L; + public static final double DOUBLE_MINUS_ZERO = Double.longBitsToDouble(MINUS_ZERO_LONGBITS); + + // We need two different NaN values. A floating point number is + // considered to be NaN is the sign bit is 0, all exponent bits + // are set to 1, and at least one bit of the exponent is not zero. + // + // As java.lang.Double.NaN is 0x7ff8000000000000L, we use + // 0x7ffc000000000000L as a second NaN double value. + public static final long NAN_LONGBITS = 0x7ffc000000000000L; + public static final double DOUBLE_NAN = Double.longBitsToDouble(NAN_LONGBITS); + + // Float values. + public static final int MINUS_INF_INTBITS = 0xff800000; + public static final float FLOAT_MINUS_INF = Float.intBitsToFloat(MINUS_INF_INTBITS); + + public static final int PLUS_INF_INTBITS = 0x7f800000; + public static final float FLOAT_PLUS_INF = Float.intBitsToFloat(PLUS_INF_INTBITS); + + public static final int MINUS_ZERO_INTBITS = 0x80000000; + public static final float FLOAT_MINUS_ZERO = Float.intBitsToFloat(MINUS_ZERO_INTBITS); + + // As java.lang.Float.NaN is 0x7fc00000, we use 0x7fe00000 + // as a second NaN float value. + public static final int NAN_INTBITS = 0x7fe00000; + public static final float FLOAT_NAN = Float.intBitsToFloat(NAN_INTBITS); + + + // Double tests. + static void test_double_inf(long[] result) { + double d1 = DOUBLE_MINUS_INF; + double d2 = DOUBLE_PLUS_INF; + result[0] = Double.doubleToRawLongBits(d1); + result[1] = Double.doubleToRawLongBits(d2); + } + + static void test_double_zero(long[] result) { + double d1 = DOUBLE_MINUS_ZERO; + double d2 = 0; + result[0] = Double.doubleToRawLongBits(d1); + result[1] = Double.doubleToRawLongBits(d2); + } + + static void test_double_nan(long[] result) { + double d1 = DOUBLE_NAN; + double d2 = Double.NaN; + result[0] = Double.doubleToRawLongBits(d1); + result[1] = Double.doubleToRawLongBits(d2); + } + + // Float tests. + static void test_float_inf(int[] result) { + float f1 = FLOAT_MINUS_INF; + float f2 = FLOAT_PLUS_INF; + result[0] = Float.floatToRawIntBits(f1); + result[1] = Float.floatToRawIntBits(f2); + } + + static void test_float_zero(int[] result) { + float f1 = FLOAT_MINUS_ZERO; + float f2 = 0; + result[0] = Float.floatToRawIntBits(f1); + result[1] = Float.floatToRawIntBits(f2); + } + + static void test_float_nan(int[] result) { + float f1 = FLOAT_NAN; + float f2 = Float.NaN; + result[0] = Float.floatToRawIntBits(f1); + result[1] = Float.floatToRawIntBits(f2); + } + + // Check doubles. + static void check_double(long[] result, double d1, double d2) { + if (result[0] == result[1]) { + throw new RuntimeException("ERROR: Two different double values are considered equal. \n" + + String.format("\toriginal values: 0x%x 0x%x\n", Double.doubleToRawLongBits(d1), Double.doubleToRawLongBits(d2)) + + String.format("\tvalues after execution of method test(): 0x%x 0x%x", result[0], result[1])); + } + } + + // Check floats. + static void check_float(int[] result, float f1, float f2) { + if (result[0] == result[1]) { + throw new RuntimeException("ERROR: Two different float values are considered equal. \n" + + String.format("\toriginal values: 0x%x 0x%x\n", Float.floatToRawIntBits(f1), Float.floatToRawIntBits(f2)) + + String.format("\tvalues after execution of method test(): 0x%x 0x%x", result[0], result[1])); + } + } + + public static void main(String[] args) { + // Float tests. + + int[] iresult = new int[2]; + + // -Inf and +Inf. + test_float_inf(iresult); + check_float(iresult, FLOAT_MINUS_INF, FLOAT_PLUS_INF); + + // 0 and -0. + test_float_zero(iresult); + check_float(iresult, FLOAT_MINUS_ZERO, 0); + + // Diferrent NaNs. + test_float_nan(iresult); + check_float(iresult, FLOAT_NAN, Float.NaN); + + // Double tests. + + long[] lresult = new long[2]; + + // -Inf and +Inf. + test_double_inf(lresult); + check_double(lresult, DOUBLE_MINUS_INF, DOUBLE_PLUS_INF); + + // 0 and -0. + test_double_zero(lresult); + check_double(lresult, DOUBLE_MINUS_ZERO, 0); + + // Diferrent NaNs. + test_double_nan(lresult); + check_double(lresult, DOUBLE_NAN, Double.NaN); + } +} From 25a0458907c88ae7b964f44d01dbdf319e2bfe02 Mon Sep 17 00:00:00 2001 From: Roland Westrelin Date: Wed, 25 Feb 2015 12:33:43 +0100 Subject: [PATCH 44/97] 8073796: assert(check_obj_alignment(result)) failed: address not aligned: .. Arrays.copyOf intrinsic can deoptimize with uninitialized new array Reviewed-by: kvn --- hotspot/src/share/vm/opto/library_call.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hotspot/src/share/vm/opto/library_call.cpp b/hotspot/src/share/vm/opto/library_call.cpp index 7af244543d6..e1fc843af61 100644 --- a/hotspot/src/share/vm/opto/library_call.cpp +++ b/hotspot/src/share/vm/opto/library_call.cpp @@ -3868,8 +3868,6 @@ bool LibraryCallKit::inline_array_copyOf(bool is_copyOfRange) { Node* orig_tail = _gvn.transform(new SubINode(orig_length, start)); Node* moved = generate_min_max(vmIntrinsics::_min, orig_tail, length); - newcopy = new_array(klass_node, length, 0); // no arguments to push - // Generate a direct call to the right arraycopy function(s). // We know the copy is disjoint but we might not know if the // oop stores need checking. @@ -3913,6 +3911,8 @@ bool LibraryCallKit::inline_array_copyOf(bool is_copyOfRange) { validated = true; } + newcopy = new_array(klass_node, length, 0); // no arguments to push + ArrayCopyNode* ac = ArrayCopyNode::make(this, true, original, start, newcopy, intcon(0), moved, true, load_object_klass(original), klass_node); if (!is_copyOfRange) { From fab80a0ca330c72a4d17a89345906cbca4d77607 Mon Sep 17 00:00:00 2001 From: Stefan Sarne Date: Thu, 26 Feb 2015 06:11:40 -0800 Subject: [PATCH 45/97] 8073718: [TESTBUG] Cleanup test output and skip creating mini dumps Reviewed-by: sla, ctornqvi --- .../runtime/Safepoint/AssertSafepointCheckConsistency1.java | 3 +-- .../runtime/Safepoint/AssertSafepointCheckConsistency2.java | 1 + .../runtime/Safepoint/AssertSafepointCheckConsistency3.java | 1 + .../runtime/Safepoint/AssertSafepointCheckConsistency4.java | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency1.java b/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency1.java index 01efb5f1119..f9f6434d143 100644 --- a/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency1.java +++ b/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency1.java @@ -47,6 +47,7 @@ public class AssertSafepointCheckConsistency1 { "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI", "-XX:-TransmitErrorReport", + "-XX:-CreateMinidumpOnCrash", "-Xmx32m", "AssertSafepointCheckConsistency1", "test"); @@ -55,5 +56,3 @@ public class AssertSafepointCheckConsistency1 { } } } - - diff --git a/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency2.java b/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency2.java index 16f776f737f..c6df9d7045e 100644 --- a/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency2.java +++ b/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency2.java @@ -47,6 +47,7 @@ public class AssertSafepointCheckConsistency2 { "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI", "-XX:-TransmitErrorReport", + "-XX:-CreateMinidumpOnCrash", "-Xmx32m", "AssertSafepointCheckConsistency2", "test"); diff --git a/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency3.java b/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency3.java index aa89c09edc3..a3c79e2f4cf 100644 --- a/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency3.java +++ b/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency3.java @@ -47,6 +47,7 @@ public class AssertSafepointCheckConsistency3 { "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI", "-XX:-TransmitErrorReport", + "-XX:-CreateMinidumpOnCrash", "-Xmx32m", "AssertSafepointCheckConsistency3", "test"); diff --git a/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency4.java b/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency4.java index f6b89143001..79096ebe2f9 100644 --- a/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency4.java +++ b/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency4.java @@ -47,6 +47,7 @@ public class AssertSafepointCheckConsistency4 { "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI", "-XX:-TransmitErrorReport", + "-XX:-CreateMinidumpOnCrash", "-Xmx32m", "AssertSafepointCheckConsistency4", "test"); From 26261a96004a16457df71a5e14915475af99b9c1 Mon Sep 17 00:00:00 2001 From: Dmitry Dmitriev Date: Thu, 26 Feb 2015 06:11:56 -0800 Subject: [PATCH 46/97] 8069291: [TESTBUG] runtime/threads/Fibonacci: OutOfMemoryError: unable to create native thread Reviewed-by: dholmes, ctornqvi --- hotspot/test/runtime/Thread/Fibonacci.java | 114 +++++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 hotspot/test/runtime/Thread/Fibonacci.java diff --git a/hotspot/test/runtime/Thread/Fibonacci.java b/hotspot/test/runtime/Thread/Fibonacci.java new file mode 100644 index 00000000000..94d38bea147 --- /dev/null +++ b/hotspot/test/runtime/Thread/Fibonacci.java @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @summary Calculates Fibonacci numbers "recursively" via threads and compares + * the result with the classical calculation. + * This test is skipped on 32-bit Windows: limited virtual space on Win-32 + * make this test inherently unstable on Windows with 32-bit VM data model. + * @requires !(os.family == "windows" & sun.arch.data.model == "32") + * @library /testlibrary + * @run main Fibonacci 15 + */ + +import com.oracle.java.testlibrary.Asserts; + +public class Fibonacci extends Thread { + private int index; + private int value; + private Fibonacci left; + private Fibonacci right; + + public Fibonacci(int i) { + index = i; + } + + private int getValue() { + return value; + } + + @Override + public void run() { + if (index == 0 || index == 1) { + // base cases, 0 Fibonacci number = 0, 1 Fibonacci number = 1 + value = index; + } else { + // inductive cases + left = new Fibonacci(index - 2); + right = new Fibonacci(index - 1); + left.start(); + right.start(); + try { + left.join(); + right.join(); + } catch (InterruptedException e) { + throw new Error("InterruptedException for index " + index, e); + } + // compute and terminate + value = left.getValue() + right.getValue(); + } + } + + public static int traditionalFibonacci(int n) { + int n1 = 0, n2 = 1, nn = 0; + + if (n == 0 || n == 1) { + nn = n; + } + + for (int i = 1; i < n; ++i) { + nn = n2 + n1; + n1 = n2; + n2 = nn; + } + return nn; + } + + public static void main(String[] args) throws Error,AssertionError { + int expected; + int number; + Fibonacci recursiveFibonacci; + + if (args.length != 1) { + throw new Error("Error: args.length must be 1"); + } + + number = Integer.parseInt(args[0]); + recursiveFibonacci = new Fibonacci(number); + + recursiveFibonacci.start(); + try { + recursiveFibonacci.join(); + } catch (InterruptedException e) { + throw new Error("InterruptedException in main thread", e); + } + + expected = traditionalFibonacci(number); + + System.out.println("Fibonacci[" + number + "] = " + expected); + + Asserts.assertEQ(recursiveFibonacci.getValue(), expected, + "Unexpected calculated value: " + recursiveFibonacci.getValue() + " expected " + expected ); + } +} From fd9d670156afa6c81b76658cbeaf0343867bac67 Mon Sep 17 00:00:00 2001 From: Andrey Zakharov Date: Thu, 26 Feb 2015 17:02:48 +0100 Subject: [PATCH 47/97] 8073950: Quarantine failing test: gc/TestSoftReferencesBehaviorOnOOME.java due to JDK-8073669 Quarantine gc/TestSoftReferencesBehaviorOnOOME.java Reviewed-by: mgerdin, tschatzl --- hotspot/test/gc/TestSoftReferencesBehaviorOnOOME.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hotspot/test/gc/TestSoftReferencesBehaviorOnOOME.java b/hotspot/test/gc/TestSoftReferencesBehaviorOnOOME.java index 3232b27a450..abf6f80e369 100644 --- a/hotspot/test/gc/TestSoftReferencesBehaviorOnOOME.java +++ b/hotspot/test/gc/TestSoftReferencesBehaviorOnOOME.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,7 @@ * @key gc * @summary Tests that all SoftReferences has been cleared at time of OOM. * @library /testlibrary + * @ignore 8073669 * @build TestSoftReferencesBehaviorOnOOME * @run main/othervm -Xmx128m TestSoftReferencesBehaviorOnOOME 512 2k * @run main/othervm -Xmx128m TestSoftReferencesBehaviorOnOOME 128k 256k From 1426bc9dc13bb909abba8468fd1e69d43ddb10fc Mon Sep 17 00:00:00 2001 From: Jesper Wilhelmsson Date: Thu, 26 Feb 2015 21:00:03 +0100 Subject: [PATCH 48/97] 8073883: serviceability/dcmd/gc/RunGCTest.java should not run with -XX:+ExplicitGCInvokesConcurrent Don't run test with -XX:+ExplicitGCInvokesConcurrent Reviewed-by: mgerdin --- hotspot/test/serviceability/dcmd/gc/RunGCTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hotspot/test/serviceability/dcmd/gc/RunGCTest.java b/hotspot/test/serviceability/dcmd/gc/RunGCTest.java index eb90bc0ee8f..ec135bbc352 100644 --- a/hotspot/test/serviceability/dcmd/gc/RunGCTest.java +++ b/hotspot/test/serviceability/dcmd/gc/RunGCTest.java @@ -39,7 +39,7 @@ import com.oracle.java.testlibrary.dcmd.JMXExecutor; * @library /testlibrary * @build com.oracle.java.testlibrary.* * @build com.oracle.java.testlibrary.dcmd.* - * @run testng/othervm -XX:+PrintGCDetails -Xloggc:RunGC.gclog RunGCTest + * @run testng/othervm -XX:+PrintGCDetails -Xloggc:RunGC.gclog -XX:-ExplicitGCInvokesConcurrent RunGCTest */ public class RunGCTest { public void run(CommandExecutor executor) { From dbf67b8e6990be2daa2a8d95298945c3e5ed0b23 Mon Sep 17 00:00:00 2001 From: Filipp Zhinkin Date: Fri, 27 Feb 2015 11:41:42 +0300 Subject: [PATCH 49/97] 8073154: NULL-pointer dereferencing in LIR_OpProfileType::print_instr Reviewed-by: iveresov --- hotspot/src/share/vm/c1/c1_LIR.cpp | 12 +++- .../print/TestProfileReturnTypePrinting.java | 68 +++++++++++++++++++ 2 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 hotspot/test/compiler/print/TestProfileReturnTypePrinting.java diff --git a/hotspot/src/share/vm/c1/c1_LIR.cpp b/hotspot/src/share/vm/c1/c1_LIR.cpp index 0494b28ff98..dad6ef89713 100644 --- a/hotspot/src/share/vm/c1/c1_LIR.cpp +++ b/hotspot/src/share/vm/c1/c1_LIR.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -2096,8 +2096,14 @@ void LIR_OpProfileCall::print_instr(outputStream* out) const { // LIR_OpProfileType void LIR_OpProfileType::print_instr(outputStream* out) const { - out->print("exact = "); exact_klass()->print_name_on(out); - out->print("current = "); ciTypeEntries::print_ciklass(out, current_klass()); + out->print("exact = "); + if (exact_klass() == NULL) { + out->print("unknown"); + } else { + exact_klass()->print_name_on(out); + } + out->print(" current = "); ciTypeEntries::print_ciklass(out, current_klass()); + out->print(" "); mdp()->print(out); out->print(" "); obj()->print(out); out->print(" "); tmp()->print(out); out->print(" "); diff --git a/hotspot/test/compiler/print/TestProfileReturnTypePrinting.java b/hotspot/test/compiler/print/TestProfileReturnTypePrinting.java new file mode 100644 index 00000000000..ca57139c3a2 --- /dev/null +++ b/hotspot/test/compiler/print/TestProfileReturnTypePrinting.java @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8073154 + * @build TestProfileReturnTypePrinting + * @run main/othervm -XX:TypeProfileLevel=020 + * -XX:CompileOnly=TestProfileReturnTypePrinting.testMethod + * -XX:+IgnoreUnrecognizedVMOptions -XX:+PrintLIR + * TestProfileReturnTypePrinting + * @summary Verify that c1's LIR that contains ProfileType node could be dumped + * without a crash disregard to an exact class knowledge. + */ +public class TestProfileReturnTypePrinting { + private static final int ITERATIONS = 1_000_000; + + public static void main(String args[]) { + for (int i = 0; i < ITERATIONS; i++) { + TestProfileReturnTypePrinting.testMethod(i); + } + } + + private static int testMethod(int i) { + return TestProfileReturnTypePrinting.foo().hashCode() + + TestProfileReturnTypePrinting.bar(i).hashCode(); + } + + /* Exact class of returned value is known statically. */ + private static B foo() { + return new B(); + } + + /* Exact class of returned value is not known statically. */ + private static Object bar(int i) { + if (i % 2 == 0) { + return new A(); + } else { + return new B(); + } + } + + private static class A { + } + + private static class B extends A { + } +} From 01ed1c9ea6c2710394470e4797cea920e0f1d71f Mon Sep 17 00:00:00 2001 From: Harold Seigel Date: Fri, 27 Feb 2015 12:48:06 -0500 Subject: [PATCH 50/97] 8073908: Replace hotspot/testlibrary use of sun.management with public API Use java.lang API's instead of sun.management API's. Reviewed-by: sla, iignatyev, gtriantafill, mchung --- .../ctw/src/sun/hotspot/tools/ctw/CompileTheWorld.java | 6 +++--- .../testlibrary/ctw/src/sun/hotspot/tools/ctw/Utils.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/CompileTheWorld.java b/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/CompileTheWorld.java index 12d09434d7b..b398ea1cbc8 100644 --- a/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/CompileTheWorld.java +++ b/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/CompileTheWorld.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ package sun.hotspot.tools.ctw; -import sun.management.ManagementFactoryHelper; +import java.lang.management.ManagementFactory; import java.io.*; import java.nio.file.Files; @@ -55,7 +55,7 @@ public class CompileTheWorld { try { try { - if (ManagementFactoryHelper.getCompilationMXBean() == null) { + if (ManagementFactory.getCompilationMXBean() == null) { throw new RuntimeException( "CTW can not work in interpreted mode"); } diff --git a/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Utils.java b/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Utils.java index ea621cb7b39..4e98bd8582e 100644 --- a/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Utils.java +++ b/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Utils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,7 +24,7 @@ package sun.hotspot.tools.ctw; import com.sun.management.HotSpotDiagnosticMXBean; -import sun.management.ManagementFactoryHelper; +import java.lang.management.ManagementFactory; import java.io.File; import java.util.regex.Pattern; @@ -160,7 +160,7 @@ public class Utils { public static String getVMOption(String name) { String result; HotSpotDiagnosticMXBean diagnostic - = ManagementFactoryHelper.getDiagnosticMXBean(); + = ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class); result = diagnostic.getVMOption(name).getValue(); return result; } From 40d3986051d2cd4f4ba433fd795991d0d562d466 Mon Sep 17 00:00:00 2001 From: Kim Barrett Date: Fri, 27 Feb 2015 19:52:48 -0500 Subject: [PATCH 51/97] 8069016: Add BarrierSet downcast support Add FakeRttiSupport utility and use to provide barrier_set_cast. Reviewed-by: jmasa, sangheki --- hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp | 10 +- hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp | 2 +- .../src/cpu/sparc/vm/c1_Runtime1_sparc.cpp | 4 +- .../src/cpu/sparc/vm/macroAssembler_sparc.cpp | 8 +- .../src/cpu/sparc/vm/stubGenerator_sparc.cpp | 4 +- hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp | 6 +- hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp | 6 +- .../src/cpu/x86/vm/stubGenerator_x86_32.cpp | 4 +- .../src/cpu/x86/vm/stubGenerator_x86_64.cpp | 4 +- hotspot/src/share/vm/c1/c1_LIRGenerator.cpp | 7 +- .../src/share/vm/compiler/disassembler.cpp | 4 +- .../gc_implementation/g1/concurrentMark.cpp | 6 +- .../gc_implementation/g1/g1CollectedHeap.hpp | 2 +- .../g1/g1SATBCardTableModRefBS.cpp | 11 +- .../g1/g1SATBCardTableModRefBS.hpp | 21 ++-- .../vm/gc_implementation/g1/heapRegion.cpp | 12 +-- .../parallelScavenge/cardTableExtension.cpp | 12 ++- .../parallelScavenge/cardTableExtension.hpp | 19 +++- .../parallelScavenge/psMarkSweep.cpp | 18 ++-- .../parallelScavenge/psOldGen.cpp | 6 +- .../parallelScavenge/psParallelCompact.cpp | 18 ++-- .../parallelScavenge/psScavenge.cpp | 7 +- .../parallelScavenge/psTasks.cpp | 6 +- hotspot/src/share/vm/memory/barrierSet.hpp | 63 ++++++++--- .../src/share/vm/memory/barrierSet.inline.hpp | 6 +- .../src/share/vm/memory/cardTableModRefBS.cpp | 6 +- .../src/share/vm/memory/cardTableModRefBS.hpp | 28 +++-- .../src/share/vm/memory/modRefBarrierSet.hpp | 12 ++- hotspot/src/share/vm/opto/graphKit.cpp | 3 +- hotspot/src/share/vm/runtime/vmStructs.cpp | 1 - hotspot/src/share/vm/shark/sharkBuilder.cpp | 4 +- .../share/vm/utilities/fakeRttiSupport.hpp | 100 ++++++++++++++++++ 32 files changed, 289 insertions(+), 131 deletions(-) create mode 100644 hotspot/src/share/vm/utilities/fakeRttiSupport.hpp diff --git a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp index b0d4280a4d3..89973056451 100644 --- a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp +++ b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright 2012, 2014 SAP AG. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -2204,7 +2204,8 @@ void MacroAssembler::serialize_memory(Register thread, Register tmp1, Register t // Write the card table byte if needed. void MacroAssembler::card_write_barrier_post(Register Rstore_addr, Register Rnew_val, Register Rtmp) { - CardTableModRefBS* bs = (CardTableModRefBS*) Universe::heap()->barrier_set(); + CardTableModRefBS* bs = + barrier_set_cast(Universe::heap()->barrier_set()); assert(bs->kind() == BarrierSet::CardTableModRef || bs->kind() == BarrierSet::CardTableExtension, "wrong barrier"); #ifdef ASSERT @@ -2310,9 +2311,8 @@ void MacroAssembler::g1_write_barrier_post(Register Rstore_addr, Register Rnew_v Label& filtered = (filtered_ext != NULL) ? *filtered_ext : filtered_int; assert_different_registers(Rstore_addr, Rnew_val, Rtmp1, Rtmp2); - G1SATBCardTableModRefBS* bs = (G1SATBCardTableModRefBS*) Universe::heap()->barrier_set(); - assert(bs->kind() == BarrierSet::G1SATBCT || - bs->kind() == BarrierSet::G1SATBCTLogging, "wrong barrier"); + G1SATBCardTableLoggingModRefBS* bs = + barrier_set_cast(Universe::heap()->barrier_set()); // Does store cross heap regions? if (G1RSBarrierRegionFilter) { diff --git a/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp b/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp index 43258ce2a9a..6c085197515 100644 --- a/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp +++ b/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp @@ -694,7 +694,7 @@ class StubGenerator: public StubCodeGenerator { __ release(); } - CardTableModRefBS* const ct = (CardTableModRefBS*)bs; + CardTableModRefBS* const ct = barrier_set_cast(bs); assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust this code"); assert_different_registers(addr, count, tmp); diff --git a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp index 9f9fc75bd1b..c27f81abd6d 100644 --- a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp +++ b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -916,7 +916,7 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) { Register cardtable = G5; Register tmp = G1_scratch; Register tmp2 = G3_scratch; - jbyte* byte_map_base = ((CardTableModRefBS*)bs)->byte_map_base; + jbyte* byte_map_base = barrier_set_cast(bs)->byte_map_base; Label not_already_dirty, restart, refill, young_card; diff --git a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp b/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp index 226b80daade..3a932ccee55 100644 --- a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp +++ b/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp @@ -3858,9 +3858,8 @@ void MacroAssembler::g1_write_barrier_post(Register store_addr, Register new_val if (new_val == G0) return; - G1SATBCardTableModRefBS* bs = (G1SATBCardTableModRefBS*) Universe::heap()->barrier_set(); - assert(bs->kind() == BarrierSet::G1SATBCT || - bs->kind() == BarrierSet::G1SATBCTLogging, "wrong barrier"); + G1SATBCardTableLoggingModRefBS* bs = + barrier_set_cast(Universe::heap()->barrier_set()); if (G1RSBarrierRegionFilter) { xor3(store_addr, new_val, tmp); @@ -3904,7 +3903,8 @@ void MacroAssembler::g1_write_barrier_post(Register store_addr, Register new_val void MacroAssembler::card_write_barrier_post(Register store_addr, Register new_val, Register tmp) { // If we're writing constant NULL, we can skip the write barrier. if (new_val == G0) return; - CardTableModRefBS* bs = (CardTableModRefBS*) Universe::heap()->barrier_set(); + CardTableModRefBS* bs = + barrier_set_cast(Universe::heap()->barrier_set()); assert(bs->kind() == BarrierSet::CardTableModRef || bs->kind() == BarrierSet::CardTableExtension, "wrong barrier"); card_table_write(bs->byte_map_base, tmp, store_addr); diff --git a/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp b/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp index 780120bd60d..196bc8d4840 100644 --- a/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp +++ b/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1019,7 +1019,7 @@ class StubGenerator: public StubCodeGenerator { case BarrierSet::CardTableModRef: case BarrierSet::CardTableExtension: { - CardTableModRefBS* ct = (CardTableModRefBS*)bs; + CardTableModRefBS* ct = barrier_set_cast(bs); assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust this code"); assert_different_registers(addr, count, tmp); diff --git a/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp b/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp index 63da256a7a9..fa7e8c3dd0f 100644 --- a/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp +++ b/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1718,8 +1718,8 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) { // arg0: store_address Address store_addr(rbp, 2*BytesPerWord); - BarrierSet* bs = Universe::heap()->barrier_set(); - CardTableModRefBS* ct = (CardTableModRefBS*)bs; + CardTableModRefBS* ct = + barrier_set_cast(Universe::heap()->barrier_set()); assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust this code"); Label done; diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp index 85c738ad4ed..32af915065d 100644 --- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp +++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp @@ -4204,8 +4204,8 @@ void MacroAssembler::g1_write_barrier_post(Register store_addr, Address buffer(thread, in_bytes(JavaThread::dirty_card_queue_offset() + PtrQueue::byte_offset_of_buf())); - BarrierSet* bs = Universe::heap()->barrier_set(); - CardTableModRefBS* ct = (CardTableModRefBS*)bs; + CardTableModRefBS* ct = + barrier_set_cast(Universe::heap()->barrier_set()); assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust this code"); Label done; @@ -4305,7 +4305,7 @@ void MacroAssembler::store_check_part_1(Register obj) { void MacroAssembler::store_check_part_2(Register obj) { BarrierSet* bs = Universe::heap()->barrier_set(); assert(bs->kind() == BarrierSet::CardTableModRef, "Wrong barrier set kind"); - CardTableModRefBS* ct = (CardTableModRefBS*)bs; + CardTableModRefBS* ct = barrier_set_cast(bs); assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust this code"); // The calculation for byte_map_base is as follows: diff --git a/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp b/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp index 1622fe5ffc5..086ac2f2ba6 100644 --- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp +++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -752,7 +752,7 @@ class StubGenerator: public StubCodeGenerator { case BarrierSet::CardTableModRef: case BarrierSet::CardTableExtension: { - CardTableModRefBS* ct = (CardTableModRefBS*)bs; + CardTableModRefBS* ct = barrier_set_cast(bs); assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust this code"); Label L_loop; diff --git a/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp b/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp index c3c2500126d..7f6dbc83847 100644 --- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp +++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1272,7 +1272,7 @@ class StubGenerator: public StubCodeGenerator { case BarrierSet::CardTableModRef: case BarrierSet::CardTableExtension: { - CardTableModRefBS* ct = (CardTableModRefBS*)bs; + CardTableModRefBS* ct = barrier_set_cast(bs); assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust this code"); Label L_loop; diff --git a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp index 0a1e7410503..a606b7bf843 100644 --- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp +++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp @@ -1582,9 +1582,9 @@ void LIRGenerator::G1SATBCardTableModRef_post_barrier(LIR_OprDesc* addr, LIR_Opr //////////////////////////////////////////////////////////////////////// void LIRGenerator::CardTableModRef_post_barrier(LIR_OprDesc* addr, LIR_OprDesc* new_val) { - - assert(sizeof(*((CardTableModRefBS*)_bs)->byte_map_base) == sizeof(jbyte), "adjust this code"); - LIR_Const* card_table_base = new LIR_Const(((CardTableModRefBS*)_bs)->byte_map_base); + CardTableModRefBS* ct = barrier_set_cast(_bs); + assert(sizeof(*(ct->byte_map_base)) == sizeof(jbyte), "adjust this code"); + LIR_Const* card_table_base = new LIR_Const(ct->byte_map_base); if (addr->is_address()) { LIR_Address* address = addr->as_address_ptr(); // ptr cannot be an object because we use this barrier for array card marks @@ -1609,7 +1609,6 @@ void LIRGenerator::CardTableModRef_post_barrier(LIR_OprDesc* addr, LIR_OprDesc* __ move(new LIR_Address(FrameMap::Rthread_opr, in_bytes(JavaThread::card_table_base_offset()), T_ADDRESS), tmp); } - CardTableModRefBS* ct = (CardTableModRefBS*)_bs; LIR_Address *card_addr = new LIR_Address(tmp, addr, (LIR_Address::Scale) -CardTableModRefBS::card_shift, 0, T_BYTE); if(((int)ct->byte_map_base & 0xff) == 0) { __ move(tmp, card_addr); diff --git a/hotspot/src/share/vm/compiler/disassembler.cpp b/hotspot/src/share/vm/compiler/disassembler.cpp index 00946fafbbf..b5d0b44ad6d 100644 --- a/hotspot/src/share/vm/compiler/disassembler.cpp +++ b/hotspot/src/share/vm/compiler/disassembler.cpp @@ -340,8 +340,8 @@ void decode_env::print_address(address adr) { } BarrierSet* bs = Universe::heap()->barrier_set(); - if (bs->kind() == BarrierSet::CardTableModRef && - adr == (address)((CardTableModRefBS*)(bs))->byte_map_base) { + if (bs->is_a(BarrierSet::CardTableModRef) && + adr == (address)(barrier_set_cast(bs)->byte_map_base)) { st->print("word_map_base"); if (WizardMode) st->print(" " INTPTR_FORMAT, (intptr_t)adr); return; diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp index 0119858fe5b..bdd5e551016 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1440,7 +1440,7 @@ public: CMCountDataClosureBase(G1CollectedHeap* g1h, BitMap* region_bm, BitMap* card_bm): _g1h(g1h), _cm(g1h->concurrent_mark()), - _ct_bs((CardTableModRefBS*) (g1h->barrier_set())), + _ct_bs(barrier_set_cast(g1h->barrier_set())), _region_bm(region_bm), _card_bm(card_bm) { } }; @@ -3111,7 +3111,7 @@ class AggregateCountDataHRClosure: public HeapRegionClosure { BitMap* cm_card_bm, uint max_worker_id) : _g1h(g1h), _cm(g1h->concurrent_mark()), - _ct_bs((CardTableModRefBS*) (g1h->barrier_set())), + _ct_bs(barrier_set_cast(g1h->barrier_set())), _cm_card_bm(cm_card_bm), _max_worker_id(max_worker_id) { } bool doHeapRegion(HeapRegion* hr) { diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp index fa51a4b29c5..c47a8516a63 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp @@ -1274,7 +1274,7 @@ public: virtual bool is_in_closed_subset(const void* p) const; G1SATBCardTableLoggingModRefBS* g1_barrier_set() { - return (G1SATBCardTableLoggingModRefBS*) barrier_set(); + return barrier_set_cast(barrier_set()); } // This resets the card table to all zeros. It is used after diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp index b97a3a17828..829faeb4f87 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp @@ -33,8 +33,11 @@ #include "runtime/orderAccess.inline.hpp" #include "runtime/thread.inline.hpp" -G1SATBCardTableModRefBS::G1SATBCardTableModRefBS(MemRegion whole_heap, BarrierSet::Name kind) : - CardTableModRefBS(whole_heap, kind) { } +G1SATBCardTableModRefBS::G1SATBCardTableModRefBS( + MemRegion whole_heap, + const BarrierSet::FakeRtti& fake_rtti) : + CardTableModRefBS(whole_heap, fake_rtti.add_tag(BarrierSet::G1SATBCT)) +{ } void G1SATBCardTableModRefBS::enqueue(oop pre_val) { // Nulls should have been already filtered. @@ -130,7 +133,7 @@ void G1SATBCardTableLoggingModRefBSChangedListener::on_commit(uint start_idx, si G1SATBCardTableLoggingModRefBS:: G1SATBCardTableLoggingModRefBS(MemRegion whole_heap) : - G1SATBCardTableModRefBS(whole_heap, BarrierSet::G1SATBCTLogging), + G1SATBCardTableModRefBS(whole_heap, BarrierSet::FakeRtti(G1SATBCTLogging)), _dcqs(JavaThread::dirty_card_queue_set()), _listener() { @@ -203,7 +206,7 @@ G1SATBCardTableLoggingModRefBS::write_ref_field_static(void* field, if (new_val == NULL) return; // Otherwise, log it. G1SATBCardTableLoggingModRefBS* g1_bs = - (G1SATBCardTableLoggingModRefBS*)Universe::heap()->barrier_set(); + barrier_set_cast(Universe::heap()->barrier_set()); g1_bs->write_ref_field_work(field, new_val); } diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp index 98c8b65f3a3..c307815782d 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp @@ -43,7 +43,7 @@ protected: g1_young_gen = CT_MR_BS_last_reserved << 1 }; - G1SATBCardTableModRefBS(MemRegion whole_heap, BarrierSet::Name kind); + G1SATBCardTableModRefBS(MemRegion whole_heap, const BarrierSet::FakeRtti& fake_rtti); ~G1SATBCardTableModRefBS() { } public: @@ -53,10 +53,6 @@ public: // pre-marking object graph. static void enqueue(oop pre_val); - bool is_a(BarrierSet::Name bsn) { - return bsn == BarrierSet::G1SATBCT || CardTableModRefBS::is_a(bsn); - } - virtual bool has_write_ref_pre_barrier() { return true; } // This notes that we don't need to access any BarrierSet data @@ -128,6 +124,11 @@ public: } }; +template<> +struct BarrierSet::GetName { + static const BarrierSet::Name value = BarrierSet::G1SATBCT; +}; + class G1SATBCardTableLoggingModRefBSChangedListener : public G1MappingChangedListener { private: G1SATBCardTableLoggingModRefBS* _card_table; @@ -159,11 +160,6 @@ class G1SATBCardTableLoggingModRefBS: public G1SATBCardTableModRefBS { virtual void resize_covered_region(MemRegion new_region) { ShouldNotReachHere(); } - bool is_a(BarrierSet::Name bsn) { - return bsn == BarrierSet::G1SATBCTLogging || - G1SATBCardTableModRefBS::is_a(bsn); - } - void write_ref_field_work(void* field, oop new_val, bool release = false); // Can be called from static contexts. @@ -177,4 +173,9 @@ class G1SATBCardTableLoggingModRefBS: public G1SATBCardTableModRefBS { void write_ref_array_work(MemRegion mr) { invalidate(mr); } }; +template<> +struct BarrierSet::GetName { + static const BarrierSet::Name value = BarrierSet::G1SATBCTLogging; +}; + #endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1SATBCARDTABLEMODREFBS_HPP diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp index 68a67678208..3ad7f190563 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp @@ -193,7 +193,7 @@ void HeapRegion::par_clear() { HeapRegionRemSet* hrrs = rem_set(); hrrs->clear(); CardTableModRefBS* ct_bs = - (CardTableModRefBS*)G1CollectedHeap::heap()->barrier_set(); + barrier_set_cast(G1CollectedHeap::heap()->barrier_set()); ct_bs->clear(MemRegion(bottom(), end())); } @@ -643,13 +643,9 @@ public: // _vo == UseNextMarking -> use "next" marking information, // _vo == UseMarkWord -> use mark word from object header. VerifyLiveClosure(G1CollectedHeap* g1h, VerifyOption vo) : - _g1h(g1h), _bs(NULL), _containing_obj(NULL), - _failures(false), _n_failures(0), _vo(vo) - { - BarrierSet* bs = _g1h->barrier_set(); - if (bs->is_a(BarrierSet::CardTableModRef)) - _bs = (CardTableModRefBS*)bs; - } + _g1h(g1h), _bs(barrier_set_cast(g1h->barrier_set())), + _containing_obj(NULL), _failures(false), _n_failures(0), _vo(vo) + { } void set_containing_obj(oop obj) { _containing_obj = obj; diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp index 9630cb09357..7448978578c 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -81,7 +81,7 @@ class CheckForUnmarkedObjects : public ObjectClosure { assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity"); _young_gen = heap->young_gen(); - _card_table = (CardTableExtension*)heap->barrier_set(); + _card_table = barrier_set_cast(heap->barrier_set()); // No point in asserting barrier set type here. Need to make CardTableExtension // a unique barrier set type. } @@ -341,7 +341,9 @@ void CardTableExtension::verify_all_young_refs_precise() { PSOldGen* old_gen = heap->old_gen(); - CheckForPreciseMarks check(heap->young_gen(), (CardTableExtension*)heap->barrier_set()); + CheckForPreciseMarks check( + heap->young_gen(), + barrier_set_cast(heap->barrier_set())); old_gen->oop_iterate_no_header(&check); @@ -349,8 +351,8 @@ void CardTableExtension::verify_all_young_refs_precise() { } void CardTableExtension::verify_all_young_refs_precise_helper(MemRegion mr) { - CardTableExtension* card_table = (CardTableExtension*)Universe::heap()->barrier_set(); - // FIX ME ASSERT HERE + CardTableExtension* card_table = + barrier_set_cast(Universe::heap()->barrier_set()); jbyte* bot = card_table->byte_for(mr.start()); jbyte* top = card_table->byte_for(mr.end()); diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp index d2d3319da75..dd29609e050 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp @@ -54,10 +54,16 @@ class CardTableExtension : public CardTableModRefBS { }; CardTableExtension(MemRegion whole_heap) : - CardTableModRefBS(whole_heap, BarrierSet::CardTableModRef) { } - - // Too risky for the 4/10/02 putback - // BarrierSet::Name kind() { return BarrierSet::CardTableExtension; } + CardTableModRefBS( + whole_heap, + // Concrete tag should be BarrierSet::CardTableExtension. + // That will presently break things in a bunch of places though. + // The concrete tag is used as a dispatch key in many places, and + // CardTableExtension does not correctly dispatch in some of those + // uses. This will be addressed as part of a reorganization of the + // BarrierSet hierarchy. + BarrierSet::FakeRtti(BarrierSet::CardTableModRef, 0).add_tag(BarrierSet::CardTableExtension)) + { } // Scavenge support void scavenge_contents_parallel(ObjectStartArray* start_array, @@ -110,4 +116,9 @@ class CardTableExtension : public CardTableModRefBS { #endif // ASSERT }; +template<> +struct BarrierSet::GetName { + static const BarrierSet::Name value = BarrierSet::CardTableExtension; +}; + #endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_CARDTABLEEXTENSION_HPP diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp index e6411517bbb..7288b963c9b 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp @@ -1,6 +1,5 @@ - /* - * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -233,15 +232,12 @@ bool PSMarkSweep::invoke_no_policy(bool clear_all_softrefs) { young_gen->to_space()->is_empty(); young_gen_empty = eden_empty && survivors_empty; - BarrierSet* bs = heap->barrier_set(); - if (bs->is_a(BarrierSet::ModRef)) { - ModRefBarrierSet* modBS = (ModRefBarrierSet*)bs; - MemRegion old_mr = heap->old_gen()->reserved(); - if (young_gen_empty) { - modBS->clear(MemRegion(old_mr.start(), old_mr.end())); - } else { - modBS->invalidate(MemRegion(old_mr.start(), old_mr.end())); - } + ModRefBarrierSet* modBS = barrier_set_cast(heap->barrier_set()); + MemRegion old_mr = heap->old_gen()->reserved(); + if (young_gen_empty) { + modBS->clear(MemRegion(old_mr.start(), old_mr.end())); + } else { + modBS->invalidate(MemRegion(old_mr.start(), old_mr.end())); } // Delete metaspaces for unloaded class loaders and clean up loader_data graph diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp index a578d75f902..c7ac0eb5a9b 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -111,8 +111,8 @@ void PSOldGen::initialize_work(const char* perf_data_name, int level) { Universe::heap()->barrier_set()->resize_covered_region(cmr); - CardTableModRefBS* _ct = (CardTableModRefBS*)Universe::heap()->barrier_set(); - assert (_ct->kind() == BarrierSet::CardTableModRef, "Sanity"); + CardTableModRefBS* _ct = + barrier_set_cast(Universe::heap()->barrier_set()); // Verify that the start and end of this generation is the start of a card. // If this wasn't true, a single card could span more than one generation, diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp index 28cff7813d7..3e89b0a98e0 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1050,16 +1050,12 @@ void PSParallelCompact::post_compact() bool young_gen_empty = eden_empty && from_space->is_empty() && to_space->is_empty(); - BarrierSet* bs = heap->barrier_set(); - if (bs->is_a(BarrierSet::ModRef)) { - ModRefBarrierSet* modBS = (ModRefBarrierSet*)bs; - MemRegion old_mr = heap->old_gen()->reserved(); - - if (young_gen_empty) { - modBS->clear(MemRegion(old_mr.start(), old_mr.end())); - } else { - modBS->invalidate(MemRegion(old_mr.start(), old_mr.end())); - } + ModRefBarrierSet* modBS = barrier_set_cast(heap->barrier_set()); + MemRegion old_mr = heap->old_gen()->reserved(); + if (young_gen_empty) { + modBS->clear(MemRegion(old_mr.start(), old_mr.end())); + } else { + modBS->invalidate(MemRegion(old_mr.start(), old_mr.end())); } // Delete metaspaces for unloaded class loaders and clean up loader_data graph diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp index db5a5281df5..3c0542f3b80 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp @@ -1,6 +1,5 @@ - /* - * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -866,9 +865,7 @@ void PSScavenge::initialize() { NULL); // header provides liveness info // Cache the cardtable - BarrierSet* bs = Universe::heap()->barrier_set(); - assert(bs->kind() == BarrierSet::CardTableModRef, "Wrong barrier set kind"); - _card_table = (CardTableExtension*)bs; + _card_table = barrier_set_cast(heap->barrier_set()); _counters = new CollectorCounters("PSScavenge", 0); } diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp index f829e934408..df320d87ff0 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -183,8 +183,8 @@ void OldToYoungRootsTask::do_it(GCTaskManager* manager, uint which) { PSPromotionManager* pm = PSPromotionManager::gc_thread_promotion_manager(which); assert(Universe::heap()->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity"); - CardTableExtension* card_table = (CardTableExtension *)Universe::heap()->barrier_set(); - // FIX ME! Assert that card_table is the type we believe it to be. + CardTableExtension* card_table = + barrier_set_cast(Universe::heap()->barrier_set()); card_table->scavenge_contents_parallel(_gen->start_array(), _gen->object_space(), diff --git a/hotspot/src/share/vm/memory/barrierSet.hpp b/hotspot/src/share/vm/memory/barrierSet.hpp index 2349a45adb7..5d872fec064 100644 --- a/hotspot/src/share/vm/memory/barrierSet.hpp +++ b/hotspot/src/share/vm/memory/barrierSet.hpp @@ -27,6 +27,7 @@ #include "memory/memRegion.hpp" #include "oops/oopsHierarchy.hpp" +#include "utilities/fakeRttiSupport.hpp" // This class provides the interface between a barrier implementation and // the rest of the system. @@ -34,18 +35,61 @@ class BarrierSet: public CHeapObj { friend class VMStructs; public: - enum Name { - ModRef, - CardTableModRef, - CardTableExtension, - G1SATBCT, - G1SATBCTLogging + // Fake RTTI support. For a derived class T to participate + // - T must have a corresponding Name entry. + // - GetName must be specialized to return the corresponding Name + // entry. + // - If T is a base class, the constructor must have a FakeRtti + // parameter and pass it up to its base class, with the tag set + // augmented with the corresponding Name entry. + // - If T is a concrete class, the constructor must create a + // FakeRtti object whose tag set includes the corresponding Name + // entry, and pass it up to its base class. + + enum Name { // associated class + ModRef, // ModRefBarrierSet + CardTableModRef, // CardTableModRefBS + CardTableForRS, // CardTableModRefBSForCTRS + CardTableExtension, // CardTableExtension + G1SATBCT, // G1SATBCardTableModRefBS + G1SATBCTLogging // G1SATBCardTableLoggingModRefBS }; +protected: + typedef FakeRttiSupport FakeRtti; + +private: + FakeRtti _fake_rtti; + + // Metafunction mapping a class derived from BarrierSet to the + // corresponding Name enum tag. + template struct GetName; + + // Downcast argument to a derived barrier set type. + // The cast is checked in a debug build. + // T must have a specialization for BarrierSet::GetName. + template + friend T* barrier_set_cast(BarrierSet* bs) { + assert(bs->is_a(BarrierSet::GetName::value), "wrong type of barrier set"); + return static_cast(bs); + } + +public: + // Note: This is not presently the Name corresponding to the + // concrete class of this object. + BarrierSet::Name kind() const { return _fake_rtti.concrete_tag(); } + + // Test whether this object is of the type corresponding to bsn. + bool is_a(BarrierSet::Name bsn) const { return _fake_rtti.has_tag(bsn); } + + // End of fake RTTI support. + +public: enum Flags { None = 0, TargetUninitialized = 1 }; + protected: // Some barrier sets create tables whose elements correspond to parts of // the heap; the CardTableModRefBS is an example. Such barrier sets will @@ -53,17 +97,12 @@ protected: // "covering" parts of the heap that are committed. At most one covered // region per generation is needed. static const int _max_covered_regions = 2; - Name _kind; - BarrierSet(Name kind) : _kind(kind) { } + BarrierSet(const FakeRtti& fake_rtti) : _fake_rtti(fake_rtti) { } ~BarrierSet() { } public: - // To get around prohibition on RTTI. - BarrierSet::Name kind() { return _kind; } - virtual bool is_a(BarrierSet::Name bsn) = 0; - // These operations indicate what kind of barriers the BarrierSet has. virtual bool has_read_ref_barrier() = 0; virtual bool has_read_prim_barrier() = 0; diff --git a/hotspot/src/share/vm/memory/barrierSet.inline.hpp b/hotspot/src/share/vm/memory/barrierSet.inline.hpp index ded96f3448d..98437abf188 100644 --- a/hotspot/src/share/vm/memory/barrierSet.inline.hpp +++ b/hotspot/src/share/vm/memory/barrierSet.inline.hpp @@ -34,7 +34,7 @@ template void BarrierSet::write_ref_field_pre(T* field, oop new_val) { if (kind() == CardTableModRef) { - ((CardTableModRefBS*)this)->inline_write_ref_field_pre(field, new_val); + barrier_set_cast(this)->inline_write_ref_field_pre(field, new_val); } else { write_ref_field_pre_work(field, new_val); } @@ -42,7 +42,7 @@ template void BarrierSet::write_ref_field_pre(T* field, oop new_val) { void BarrierSet::write_ref_field(void* field, oop new_val, bool release) { if (kind() == CardTableModRef) { - ((CardTableModRefBS*)this)->inline_write_ref_field(field, new_val, release); + barrier_set_cast(this)->inline_write_ref_field(field, new_val, release); } else { write_ref_field_work(field, new_val, release); } @@ -78,7 +78,7 @@ void BarrierSet::write_ref_array(HeapWord* start, size_t count) { inline void BarrierSet::write_region(MemRegion mr) { if (kind() == CardTableModRef) { - ((CardTableModRefBS*)this)->inline_write_region(mr); + barrier_set_cast(this)->inline_write_region(mr); } else { write_region_work(mr); } diff --git a/hotspot/src/share/vm/memory/cardTableModRefBS.cpp b/hotspot/src/share/vm/memory/cardTableModRefBS.cpp index fdf264e4e88..d0024231c6d 100644 --- a/hotspot/src/share/vm/memory/cardTableModRefBS.cpp +++ b/hotspot/src/share/vm/memory/cardTableModRefBS.cpp @@ -53,8 +53,10 @@ size_t CardTableModRefBS::compute_byte_map_size() return align_size_up(_guard_index + 1, MAX2(_page_size, granularity)); } -CardTableModRefBS::CardTableModRefBS(MemRegion whole_heap, BarrierSet::Name kind) : - ModRefBarrierSet(kind), +CardTableModRefBS::CardTableModRefBS( + MemRegion whole_heap, + const BarrierSet::FakeRtti& fake_rtti) : + ModRefBarrierSet(fake_rtti.add_tag(BarrierSet::CardTableModRef)), _whole_heap(whole_heap), _guard_index(0), _guard_region(), diff --git a/hotspot/src/share/vm/memory/cardTableModRefBS.hpp b/hotspot/src/share/vm/memory/cardTableModRefBS.hpp index f2d1c12a9ce..f7cf9e68499 100644 --- a/hotspot/src/share/vm/memory/cardTableModRefBS.hpp +++ b/hotspot/src/share/vm/memory/cardTableModRefBS.hpp @@ -279,11 +279,6 @@ public: static int precleaned_card_val() { return precleaned_card; } static int deferred_card_val() { return deferred_card; } - // For RTTI simulation. - bool is_a(BarrierSet::Name bsn) { - return bsn == BarrierSet::CardTableModRef || ModRefBarrierSet::is_a(bsn); - } - virtual void initialize(); // *** Barrier set functions. @@ -292,7 +287,7 @@ public: protected: - CardTableModRefBS(MemRegion whole_heap, BarrierSet::Name kind); + CardTableModRefBS(MemRegion whole_heap, const BarrierSet::FakeRtti& fake_rtti); ~CardTableModRefBS(); // Record a reference update. Note that these versions are precise! @@ -462,6 +457,11 @@ public: void verify_dirty_region(MemRegion mr) PRODUCT_RETURN; }; +template<> +struct BarrierSet::GetName { + static const BarrierSet::Name value = BarrierSet::CardTableModRef; +}; + class CardTableRS; // A specialization for the CardTableRS gen rem set. @@ -472,10 +472,24 @@ protected: bool card_may_have_been_dirty(jbyte cv); public: CardTableModRefBSForCTRS(MemRegion whole_heap) : - CardTableModRefBS(whole_heap, BarrierSet::CardTableModRef) {} + CardTableModRefBS( + whole_heap, + // Concrete tag should be BarrierSet::CardTableForRS. + // That will presently break things in a bunch of places though. + // The concrete tag is used as a dispatch key in many places, and + // CardTableForRS does not correctly dispatch in some of those + // uses. This will be addressed as part of a reorganization of the + // BarrierSet hierarchy. + BarrierSet::FakeRtti(BarrierSet::CardTableModRef, 0).add_tag(BarrierSet::CardTableForRS)) + {} void set_CTRS(CardTableRS* rs) { _rs = rs; } }; +template<> +struct BarrierSet::GetName { + static const BarrierSet::Name value = BarrierSet::CardTableForRS; +}; + #endif // SHARE_VM_MEMORY_CARDTABLEMODREFBS_HPP diff --git a/hotspot/src/share/vm/memory/modRefBarrierSet.hpp b/hotspot/src/share/vm/memory/modRefBarrierSet.hpp index 394d2c513a6..ac7db902f83 100644 --- a/hotspot/src/share/vm/memory/modRefBarrierSet.hpp +++ b/hotspot/src/share/vm/memory/modRefBarrierSet.hpp @@ -37,10 +37,6 @@ class Generation; class ModRefBarrierSet: public BarrierSet { public: - bool is_a(BarrierSet::Name bsn) { - return bsn == BarrierSet::ModRef; - } - // Barriers only on ref writes. bool has_read_ref_barrier() { return false; } bool has_read_prim_barrier() { return false; } @@ -60,7 +56,8 @@ public: protected: - ModRefBarrierSet(BarrierSet::Name kind) : BarrierSet(kind) { } + ModRefBarrierSet(const BarrierSet::FakeRtti& fake_rtti) + : BarrierSet(fake_rtti.add_tag(BarrierSet::ModRef)) { } ~ModRefBarrierSet() { } virtual void write_ref_field_work(void* field, oop new_val, bool release = false) = 0; @@ -100,4 +97,9 @@ public: virtual void clear(MemRegion mr) = 0; }; +template<> +struct BarrierSet::GetName { + static const BarrierSet::Name value = BarrierSet::ModRef; +}; + #endif // SHARE_VM_MEMORY_MODREFBARRIERSET_HPP diff --git a/hotspot/src/share/vm/opto/graphKit.cpp b/hotspot/src/share/vm/opto/graphKit.cpp index b929d47227e..210f1abd843 100644 --- a/hotspot/src/share/vm/opto/graphKit.cpp +++ b/hotspot/src/share/vm/opto/graphKit.cpp @@ -3759,7 +3759,8 @@ void GraphKit::final_sync(IdealKit& ideal) { Node* GraphKit::byte_map_base_node() { // Get base of card map - CardTableModRefBS* ct = (CardTableModRefBS*)(Universe::heap()->barrier_set()); + CardTableModRefBS* ct = + barrier_set_cast(Universe::heap()->barrier_set()); assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust users of this code"); if (ct->byte_map_base != NULL) { return makecon(TypeRawPtr::make((address)ct->byte_map_base)); diff --git a/hotspot/src/share/vm/runtime/vmStructs.cpp b/hotspot/src/share/vm/runtime/vmStructs.cpp index 40e1b5bf434..d08119e163f 100644 --- a/hotspot/src/share/vm/runtime/vmStructs.cpp +++ b/hotspot/src/share/vm/runtime/vmStructs.cpp @@ -481,7 +481,6 @@ typedef CompactHashtable SymbolCompactHashTable; \ unchecked_nonstatic_field(ageTable, sizes, sizeof(ageTable::sizes)) \ \ - nonstatic_field(BarrierSet, _kind, BarrierSet::Name) \ nonstatic_field(BlockOffsetTable, _bottom, HeapWord*) \ nonstatic_field(BlockOffsetTable, _end, HeapWord*) \ \ diff --git a/hotspot/src/share/vm/shark/sharkBuilder.cpp b/hotspot/src/share/vm/shark/sharkBuilder.cpp index 329a94aa83c..f02a0e2020f 100644 --- a/hotspot/src/share/vm/shark/sharkBuilder.cpp +++ b/hotspot/src/share/vm/shark/sharkBuilder.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -446,7 +446,7 @@ void SharkBuilder::CreateUpdateBarrierSet(BarrierSet* bs, Value* field) { CreateIntToPtr( CreateAdd( LLVMValue::intptr_constant( - (intptr_t) ((CardTableModRefBS *) bs)->byte_map_base), + (intptr_t) (barrier_set_cast(bs)->byte_map_base)), CreateLShr( CreatePtrToInt(field, SharkType::intptr_type()), LLVMValue::intptr_constant(CardTableModRefBS::card_shift))), diff --git a/hotspot/src/share/vm/utilities/fakeRttiSupport.hpp b/hotspot/src/share/vm/utilities/fakeRttiSupport.hpp new file mode 100644 index 00000000000..8c564004a91 --- /dev/null +++ b/hotspot/src/share/vm/utilities/fakeRttiSupport.hpp @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef SHARE_VM_UTILITIES_FAKERTTISUPPORT_HPP +#define SHARE_VM_UTILITIES_FAKERTTISUPPORT_HPP + +#include "utilities/globalDefinitions.hpp" +#include "utilities/debug.hpp" + +// Provides support for checked downcasts in a hierarchy of classes. +// The base class provides a member of this type, specialized on that +// base class and an associated tag type. Tags are small non-negative +// integer values uniquely associated with distinct classes in the +// hierarchy. A tag type is often an enum type. +// +// The concrete class specifies the concrete tag. +// +// The tag set specifies the set of classes in the derivation +// sequence. Classes in the derivation sequence add their associated +// tag during construction. Given the tag associated with a class, an +// object is an instance of that class if the tag is included in the +// object's set of recorded tags. +// +// A tag T is present in a tag set if the T'th bit of the tag set is +// one. +// +// Note: The representation of a tag set being uintx sets an upper +// bound on the size of a class hierarchy this utility can be used +// with. +template +class FakeRttiSupport VALUE_OBJ_CLASS_SPEC { +public: + // Construct with the indicated concrete tag, and include the + // concrete tag in the associated tag set. + explicit FakeRttiSupport(TagType concrete_tag) : + _tag_set(tag_bit(concrete_tag)), _concrete_tag(concrete_tag) { } + + // Construct with the indicated concrete tag and tag set. + // Note: This constructor is public only to allow clients to set up + // "unusual" (or perhaps buggy) fake RTTI configurations. + FakeRttiSupport(TagType concrete_tag, uintx tag_set) : + _tag_set(tag_set), _concrete_tag(validate_tag(concrete_tag)) { } + + // Get the concrete tag. + TagType concrete_tag() const { return _concrete_tag; } + + // Test whether tag is in the tag set. + bool has_tag(TagType tag) const { + return (_tag_set & tag_bit(tag)) != 0; + } + + // Return a new support object which is the same as this, except tag + // has been added to the tag set. The tag must not already be + // present in the tag set. + FakeRttiSupport add_tag(TagType tag) const { + uintx tbit = tag_bit(tag); + assert((_tag_set & tbit) == 0, + err_msg("Tag " UINTX_FORMAT " is already present in tag set: " UINTX_FORMAT, + (uintx)tag, _tag_set)); + return FakeRttiSupport(_concrete_tag, _tag_set | tbit); + } + +private: + uintx _tag_set; + TagType _concrete_tag; + + static uintx tag_bit(TagType tag) { + return ((uintx)1) << validate_tag(tag); + } + + static TagType validate_tag(uintx tag) { + // Type of tag is not TagType to dodge useless MacOSX compiler warning. + assert(tag < (sizeof(uintx) * BitsPerByte), + err_msg("Tag " UINTX_FORMAT " is too large", tag)); + return static_cast(tag); + } +}; + +#endif // include guard From 3f42ccd0ffb2c5bfbf937bfe6a44086469da92d6 Mon Sep 17 00:00:00 2001 From: Tobias Hartmann Date: Mon, 2 Mar 2015 13:16:07 +0100 Subject: [PATCH 52/97] 8073956: Escape analysis dump misses args information Fixed output of PrintEscapeAnalysis. Reviewed-by: kvn --- hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp b/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp index 634878e62e9..6fc6d9084de 100644 --- a/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp +++ b/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp @@ -1392,12 +1392,12 @@ void BCEscapeAnalyzer::dump() { method()->print_short_name(); tty->print_cr(has_dependencies() ? " (not stored)" : ""); tty->print(" non-escaping args: "); - _arg_local.print_on(tty); + _arg_local.print(); tty->print(" stack-allocatable args: "); - _arg_stack.print_on(tty); + _arg_stack.print(); if (_return_local) { tty->print(" returned args: "); - _arg_returned.print_on(tty); + _arg_returned.print(); } else if (is_return_allocated()) { tty->print_cr(" return allocated value"); } else { From b4420f15166547bd3fc44d4a90d65a4dc77c2092 Mon Sep 17 00:00:00 2001 From: Tobias Hartmann Date: Mon, 2 Mar 2015 13:40:40 +0100 Subject: [PATCH 53/97] 8006960: hotspot, "impossible" assertion failure Escape state of allocated object should be always adjusted after it was passed to a method. Reviewed-by: kvn --- hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp | 8 +- .../TestEscapeThroughInvoke.java | 74 +++++++++++++++++++ 2 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 hotspot/test/compiler/escapeAnalysis/TestEscapeThroughInvoke.java diff --git a/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp b/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp index 634878e62e9..6bd8f6ebc9f 100644 --- a/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp +++ b/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp @@ -43,7 +43,7 @@ #define TRACE_BCEA(level, code) #endif -// Maintain a map of which aguments a local variable or +// Maintain a map of which arguments a local variable or // stack slot may contain. In addition to tracking // arguments, it tracks two special values, "allocated" // which represents any object allocated in the current @@ -319,14 +319,16 @@ void BCEscapeAnalyzer::invoke(StateInfo &state, Bytecodes::Code code, ciMethod* bool must_record_dependencies = false; for (i = arg_size - 1; i >= 0; i--) { ArgumentMap arg = state.raw_pop(); - if (!is_argument(arg)) + // Check if callee arg is a caller arg or an allocated object + bool allocated = arg.contains_allocated(); + if (!(is_argument(arg) || allocated)) continue; for (int j = 0; j < _arg_size; j++) { if (arg.contains(j)) { _arg_modified[j] |= analyzer._arg_modified[i]; } } - if (!is_arg_stack(arg)) { + if (!(is_arg_stack(arg) || allocated)) { // arguments have already been recognized as escaping } else if (analyzer.is_arg_stack(i) && !analyzer.is_arg_returned(i)) { set_method_escape(arg); diff --git a/hotspot/test/compiler/escapeAnalysis/TestEscapeThroughInvoke.java b/hotspot/test/compiler/escapeAnalysis/TestEscapeThroughInvoke.java new file mode 100644 index 00000000000..7eac5e00660 --- /dev/null +++ b/hotspot/test/compiler/escapeAnalysis/TestEscapeThroughInvoke.java @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8073956 + * @summary Tests C2 EA with allocated object escaping through a call. + * @run main/othervm -XX:CompileCommand=dontinline,TestEscapeThroughInvoke::create TestEscapeThroughInvoke + */ +public class TestEscapeThroughInvoke { + private A a; + + public static void main(String[] args) { + TestEscapeThroughInvoke test = new TestEscapeThroughInvoke(); + test.a = new A(42); + // Make sure run gets compiled by C2 + for (int i = 0; i < 100_000; ++i) { + test.run(); + } + } + + private void run() { + // Allocate something to trigger EA + new Object(); + // Create a new escaping instance of A and + // verify that it is always equal to 'a.saved'. + A escapingA = create(42); + a.check(escapingA); + } + + // Create and return a new instance of A that escaped through 'A::saveInto'. + // The 'dummy' parameters are needed to avoid EA skipping the methods. + private A create(Integer dummy) { + A result = new A(dummy); + result.saveInto(a, dummy); // result escapes into 'a' here + return result; + } +} + +class A { + private A saved; + + public A(Integer dummy) { } + + public void saveInto(A other, Integer dummy) { + other.saved = this; + } + + public void check(A other) { + if (this.saved != other) { + throw new RuntimeException("TEST FAILED: Objects not equal."); + } + } +} From a827cdfa1047ee0af30bb454aad2067420103bae Mon Sep 17 00:00:00 2001 From: David Lindholm Date: Tue, 3 Mar 2015 12:19:35 +0100 Subject: [PATCH 54/97] 8073464: GC workers do not have thread names Reviewed-by: brutisso, tschatzl --- .../concurrentMarkSweep/concurrentMarkSweepThread.cpp | 6 ++---- .../vm/gc_implementation/parallelScavenge/gcTaskThread.cpp | 3 ++- .../vm/gc_implementation/shared/concurrentGCThread.cpp | 3 ++- hotspot/src/share/vm/runtime/thread.cpp | 4 ++++ hotspot/src/share/vm/runtime/thread.hpp | 3 ++- hotspot/src/share/vm/runtime/vmThread.cpp | 2 +- hotspot/src/share/vm/utilities/workgroup.cpp | 3 ++- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp index b588cce717e..73f265a4028 100644 --- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp +++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -97,9 +97,7 @@ ConcurrentMarkSweepThread::ConcurrentMarkSweepThread(CMSCollector* collector) void ConcurrentMarkSweepThread::run() { assert(this == cmst(), "just checking"); - this->record_stack_base_and_size(); - this->initialize_thread_local_storage(); - this->set_active_handles(JNIHandleBlock::allocate_block()); + initialize_in_thread(); // From this time Thread::current() should be working. assert(this == Thread::current(), "just checking"); if (BindCMSThreadToCPU && !os::bind_to_processor(CPUForCMSThread)) { diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp index b3b550af6cc..ff58762c20e 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -98,6 +98,7 @@ void GCTaskThread::run() { // Set up the thread for stack overflow support this->record_stack_base_and_size(); this->initialize_thread_local_storage(); + this->initialize_named_thread(); // Bind yourself to your processor. if (processor_id() != GCTaskManager::sentinel_worker()) { if (TraceGCTaskThread) { diff --git a/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp b/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp index c90da2b0d39..9002cd06f26 100644 --- a/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp +++ b/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -56,6 +56,7 @@ void ConcurrentGCThread::create_and_start() { void ConcurrentGCThread::initialize_in_thread() { this->record_stack_base_and_size(); this->initialize_thread_local_storage(); + this->initialize_named_thread(); this->set_active_handles(JNIHandleBlock::allocate_block()); // From this time Thread::current() should be working. assert(this == Thread::current(), "just checking"); diff --git a/hotspot/src/share/vm/runtime/thread.cpp b/hotspot/src/share/vm/runtime/thread.cpp index 00e5f804588..6af1923cf3f 100644 --- a/hotspot/src/share/vm/runtime/thread.cpp +++ b/hotspot/src/share/vm/runtime/thread.cpp @@ -1161,6 +1161,10 @@ void NamedThread::set_name(const char* format, ...) { va_end(ap); } +void NamedThread::initialize_named_thread() { + set_native_thread_name(name()); +} + void NamedThread::print_on(outputStream* st) const { st->print("\"%s\" ", name()); Thread::print_on(st); diff --git a/hotspot/src/share/vm/runtime/thread.hpp b/hotspot/src/share/vm/runtime/thread.hpp index 399a2cbe671..2a6d40d65fd 100644 --- a/hotspot/src/share/vm/runtime/thread.hpp +++ b/hotspot/src/share/vm/runtime/thread.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -667,6 +667,7 @@ class NamedThread: public Thread { ~NamedThread(); // May only be called once per thread. void set_name(const char* format, ...) ATTRIBUTE_PRINTF(2, 3); + void initialize_named_thread(); virtual bool is_Named_thread() const { return true; } virtual char* name() const { return _name == NULL ? (char*)"Unknown Thread" : _name; } JavaThread *processed_thread() { return _processed_thread; } diff --git a/hotspot/src/share/vm/runtime/vmThread.cpp b/hotspot/src/share/vm/runtime/vmThread.cpp index c349c06c962..8e34fa48525 100644 --- a/hotspot/src/share/vm/runtime/vmThread.cpp +++ b/hotspot/src/share/vm/runtime/vmThread.cpp @@ -243,7 +243,7 @@ void VMThread::run() { assert(this == vm_thread(), "check"); this->initialize_thread_local_storage(); - this->set_native_thread_name(this->name()); + this->initialize_named_thread(); this->record_stack_base_and_size(); // Notify_lock wait checks on active_handles() to rewait in // case of spurious wakeup, it should wait on the last diff --git a/hotspot/src/share/vm/utilities/workgroup.cpp b/hotspot/src/share/vm/utilities/workgroup.cpp index 8e9fa51e096..3f20f36ce7e 100644 --- a/hotspot/src/share/vm/utilities/workgroup.cpp +++ b/hotspot/src/share/vm/utilities/workgroup.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -247,6 +247,7 @@ void GangWorker::run() { void GangWorker::initialize() { this->initialize_thread_local_storage(); this->record_stack_base_and_size(); + this->initialize_named_thread(); assert(_gang != NULL, "No gang to run in"); os::set_priority(this, NearMaxPriority); if (TraceWorkGang) { From 2d22f2780ce21e661ffae483940a7c1a5cf7d0ad Mon Sep 17 00:00:00 2001 From: Thomas Schatzl Date: Tue, 3 Mar 2015 12:38:42 +0100 Subject: [PATCH 55/97] 8073466: Remove buffer retaining functionality and clean up in ParGCAllocBuffer Reviewed-by: jmasa, kbarrett --- .../vm/gc_implementation/g1/g1Allocator.cpp | 8 +- .../vm/gc_implementation/g1/g1Allocator.hpp | 6 +- .../parNew/parNewGeneration.cpp | 9 +- .../shared/parGCAllocBuffer.cpp | 128 ++++++++---------- .../shared/parGCAllocBuffer.hpp | 113 ++++++---------- 5 files changed, 113 insertions(+), 151 deletions(-) diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.cpp index da75e61a8a7..4e199a6c28e 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -120,7 +120,7 @@ HeapWord* G1ParGCAllocator::allocate_direct_or_new_plab(InCSetState dest, if (word_sz * 100 < gclab_word_size * ParallelGCBufferWastePct) { G1ParGCAllocBuffer* alloc_buf = alloc_buffer(dest, context); add_to_alloc_buffer_waste(alloc_buf->words_remaining()); - alloc_buf->retire(false /* end_of_gc */, false /* retain */); + alloc_buf->retire(); HeapWord* buf = _g1h->par_allocate_during_gc(dest, gclab_word_size, context); if (buf == NULL) { @@ -154,9 +154,7 @@ void G1DefaultParGCAllocator::retire_alloc_buffers() { G1ParGCAllocBuffer* const buf = _alloc_buffers[state]; if (buf != NULL) { add_to_alloc_buffer_waste(buf->words_remaining()); - buf->flush_stats_and_retire(_g1h->alloc_buffer_stats(state), - true /* end_of_gc */, - false /* retain */); + buf->flush_and_retire_stats(_g1h->alloc_buffer_stats(state)); } } } diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp index b32a4191dca..f14b1df4d8c 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -159,11 +159,11 @@ public: _retired = false; } - virtual void retire(bool end_of_gc, bool retain) { + virtual void retire() { if (_retired) { return; } - ParGCAllocBuffer::retire(end_of_gc, retain); + ParGCAllocBuffer::retire(); _retired = true; } }; diff --git a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp index c4b0f9717e4..a54864db074 100644 --- a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp +++ b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -232,7 +232,7 @@ HeapWord* ParScanThreadState::alloc_in_to_space_slow(size_t word_sz) { if (word_sz * 100 < ParallelGCBufferWastePct * plab->word_sz()) { // Is small enough; abandon this buffer and start a new one. - plab->retire(false, false); + plab->retire(); size_t buf_size = plab->word_sz(); HeapWord* buf_space = sp->par_allocate(buf_size); if (buf_space == NULL) { @@ -463,10 +463,7 @@ void ParScanThreadStateSet::flush() // Flush stats related to To-space PLAB activity and // retire the last buffer. - par_scan_state.to_space_alloc_buffer()-> - flush_stats_and_retire(_gen.plab_stats(), - true /* end_of_gc */, - false /* retain */); + par_scan_state.to_space_alloc_buffer()->flush_and_retire_stats(_gen.plab_stats()); // Every thread has its own age table. We need to merge // them all into one. diff --git a/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp b/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp index 0a396050fbe..fe21e584cf7 100644 --- a/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp +++ b/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,27 +24,30 @@ #include "precompiled.hpp" #include "gc_implementation/shared/parGCAllocBuffer.hpp" -#include "memory/sharedHeap.hpp" +#include "memory/threadLocalAllocBuffer.hpp" #include "oops/arrayOop.hpp" #include "oops/oop.inline.hpp" -#include "utilities/globalDefinitions.hpp" -PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC +size_t ParGCAllocBuffer::min_size() { + // Make sure that we return something that is larger than AlignmentReserve + return align_object_size(MAX2(MinTLABSize / HeapWordSize, (uintx)oopDesc::header_size())) + AlignmentReserve; +} + +size_t ParGCAllocBuffer::max_size() { + return ThreadLocalAllocBuffer::max_size(); +} ParGCAllocBuffer::ParGCAllocBuffer(size_t desired_plab_sz_) : _word_sz(desired_plab_sz_), _bottom(NULL), _top(NULL), - _end(NULL), _hard_end(NULL), - _retained(false), _retained_filler(), - _allocated(0), _wasted(0) + _end(NULL), _hard_end(NULL), _allocated(0), _wasted(0) { - assert (min_size() > AlignmentReserve, "Inconsistency!"); - // arrayOopDesc::header_size depends on command line initialization. - FillerHeaderSize = align_object_size(arrayOopDesc::header_size(T_INT)); - AlignmentReserve = oopDesc::header_size() > MinObjAlignment ? FillerHeaderSize : 0; + // ArrayOopDesc::header_size depends on command line initialization. + AlignmentReserve = oopDesc::header_size() > MinObjAlignment ? align_object_size(arrayOopDesc::header_size(T_INT)) : 0; + assert(min_size() > AlignmentReserve, + err_msg("Minimum PLAB size " SIZE_FORMAT" must be larger than alignment reserve " SIZE_FORMAT" " + "to be able to contain objects", min_size(), AlignmentReserve)); } -size_t ParGCAllocBuffer::FillerHeaderSize; - // If the minimum object size is greater than MinObjAlignment, we can // end up with a shard at the end of the buffer that's smaller than // the smallest object. We can't allow that because the buffer must @@ -52,39 +55,33 @@ size_t ParGCAllocBuffer::FillerHeaderSize; // sure we have enough space for a filler int array object. size_t ParGCAllocBuffer::AlignmentReserve; -void ParGCAllocBuffer::retire(bool end_of_gc, bool retain) { - assert(!retain || end_of_gc, "Can only retain at GC end."); - if (_retained) { - // If the buffer had been retained shorten the previous filler object. - assert(_retained_filler.end() <= _top, "INVARIANT"); - CollectedHeap::fill_with_object(_retained_filler); - // Wasted space book-keeping, otherwise (normally) done in invalidate() - _wasted += _retained_filler.word_size(); - _retained = false; - } - assert(!end_of_gc || !_retained, "At this point, end_of_gc ==> !_retained."); - if (_top < _hard_end) { - CollectedHeap::fill_with_object(_top, _hard_end); - if (!retain) { - invalidate(); - } else { - // Is there wasted space we'd like to retain for the next GC? - if (pointer_delta(_end, _top) > FillerHeaderSize) { - _retained = true; - _retained_filler = MemRegion(_top, FillerHeaderSize); - _top = _top + FillerHeaderSize; - } else { - invalidate(); - } - } - } -} +void ParGCAllocBuffer::flush_and_retire_stats(PLABStats* stats) { + // Retire the last allocation buffer. + size_t unused = retire_internal(); -void ParGCAllocBuffer::flush_stats(PLABStats* stats) { - assert(ResizePLAB, "Wasted work"); + // Now flush the statistics. stats->add_allocated(_allocated); stats->add_wasted(_wasted); - stats->add_unused(pointer_delta(_end, _top)); + stats->add_unused(unused); + + // Since we have flushed the stats we need to clear the _allocated and _wasted + // fields in case somebody retains an instance of this over GCs. Not doing so + // will artifically inflate the values in the statistics. + _allocated = 0; + _wasted = 0; +} + +void ParGCAllocBuffer::retire() { + _wasted += retire_internal(); +} + +size_t ParGCAllocBuffer::retire_internal() { + size_t result = 0; + if (_top < _hard_end) { + CollectedHeap::fill_with_object(_top, _hard_end); + result += invalidate(); + } + return result; } // Compute desired plab size and latch result for later @@ -101,44 +98,37 @@ void PLABStats::adjust_desired_plab_sz(uint no_of_gc_workers) { err_msg("Inconsistency in PLAB stats: " "_allocated: "SIZE_FORMAT", " "_wasted: "SIZE_FORMAT", " - "_unused: "SIZE_FORMAT", " - "_used : "SIZE_FORMAT, - _allocated, _wasted, _unused, _used)); + "_unused: "SIZE_FORMAT, + _allocated, _wasted, _unused)); _allocated = 1; } - double wasted_frac = (double)_unused/(double)_allocated; - size_t target_refills = (size_t)((wasted_frac*TargetSurvivorRatio)/ - TargetPLABWastePct); + double wasted_frac = (double)_unused / (double)_allocated; + size_t target_refills = (size_t)((wasted_frac * TargetSurvivorRatio) / TargetPLABWastePct); if (target_refills == 0) { target_refills = 1; } - _used = _allocated - _wasted - _unused; - size_t plab_sz = _used/(target_refills*no_of_gc_workers); - if (PrintPLAB) gclog_or_tty->print(" (plab_sz = " SIZE_FORMAT " ", plab_sz); + size_t used = _allocated - _wasted - _unused; + size_t recent_plab_sz = used / (target_refills * no_of_gc_workers); // Take historical weighted average - _filter.sample(plab_sz); + _filter.sample(recent_plab_sz); // Clip from above and below, and align to object boundary - plab_sz = MAX2(min_size(), (size_t)_filter.average()); - plab_sz = MIN2(max_size(), plab_sz); - plab_sz = align_object_size(plab_sz); + size_t new_plab_sz = MAX2(min_size(), (size_t)_filter.average()); + new_plab_sz = MIN2(max_size(), new_plab_sz); + new_plab_sz = align_object_size(new_plab_sz); // Latch the result - if (PrintPLAB) gclog_or_tty->print(" desired_plab_sz = " SIZE_FORMAT ") ", plab_sz); - _desired_plab_sz = plab_sz; - // Now clear the accumulators for next round: - // note this needs to be fixed in the case where we - // are retaining across scavenges. FIX ME !!! XXX - _allocated = 0; - _wasted = 0; - _unused = 0; + if (PrintPLAB) { + gclog_or_tty->print(" (plab_sz = " SIZE_FORMAT" desired_plab_sz = " SIZE_FORMAT") ", recent_plab_sz, new_plab_sz); + } + _desired_plab_sz = new_plab_sz; + + reset(); } #ifndef PRODUCT void ParGCAllocBuffer::print() { - gclog_or_tty->print("parGCAllocBuffer: _bottom: " PTR_FORMAT " _top: " PTR_FORMAT - " _end: " PTR_FORMAT " _hard_end: " PTR_FORMAT " _retained: %c" - " _retained_filler: [" PTR_FORMAT "," PTR_FORMAT ")\n", - _bottom, _top, _end, _hard_end, - "FT"[_retained], _retained_filler.start(), _retained_filler.end()); + gclog_or_tty->print_cr("parGCAllocBuffer: _bottom: " PTR_FORMAT " _top: " PTR_FORMAT + " _end: " PTR_FORMAT " _hard_end: " PTR_FORMAT ")", + p2i(_bottom), p2i(_top), p2i(_end), p2i(_hard_end)); } #endif // !PRODUCT diff --git a/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp b/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp index 953ab2f554b..a8991a0816b 100644 --- a/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp +++ b/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,37 +24,43 @@ #ifndef SHARE_VM_GC_IMPLEMENTATION_PARNEW_PARGCALLOCBUFFER_HPP #define SHARE_VM_GC_IMPLEMENTATION_PARNEW_PARGCALLOCBUFFER_HPP -#include "gc_interface/collectedHeap.hpp" + +#include "gc_implementation/shared/gcUtil.hpp" #include "memory/allocation.hpp" -#include "memory/blockOffsetTable.hpp" -#include "memory/threadLocalAllocBuffer.hpp" +#include "runtime/atomic.hpp" #include "utilities/globalDefinitions.hpp" -// Forward decl. - +// Forward declarations. class PLABStats; // A per-thread allocation buffer used during GC. class ParGCAllocBuffer: public CHeapObj { protected: - char head[32]; - size_t _word_sz; // in HeapWord units + char head[32]; + size_t _word_sz; // In HeapWord units HeapWord* _bottom; HeapWord* _top; - HeapWord* _end; // last allocatable address + 1 - HeapWord* _hard_end; // _end + AlignmentReserve - bool _retained; // whether we hold a _retained_filler - MemRegion _retained_filler; + HeapWord* _end; // Last allocatable address + 1 + HeapWord* _hard_end; // _end + AlignmentReserve // In support of ergonomic sizing of PLAB's size_t _allocated; // in HeapWord units size_t _wasted; // in HeapWord units - char tail[32]; - static size_t FillerHeaderSize; + char tail[32]; static size_t AlignmentReserve; - // Flush the stats supporting ergonomic sizing of PLAB's - // Should not be called directly - void flush_stats(PLABStats* stats); + // Force future allocations to fail and queries for contains() + // to return false. Returns the amount of unused space in this PLAB. + size_t invalidate() { + _end = _hard_end; + size_t remaining = pointer_delta(_end, _top); // Calculate remaining space. + _top = _end; // Force future allocations to fail. + _bottom = _end; // Force future contains() queries to return false. + return remaining; + } + + // Fill in remaining space with a dummy object and invalidate the PLAB. Returns + // the amount of remaining space. + size_t retire_internal(); public: // Initializes the buffer to be empty, but with the given "word_sz". @@ -62,14 +68,10 @@ public: ParGCAllocBuffer(size_t word_sz); virtual ~ParGCAllocBuffer() {} - static const size_t min_size() { - // Make sure that we return something that is larger than AlignmentReserve - return align_object_size(MAX2(MinTLABSize / HeapWordSize, (uintx)oopDesc::header_size())) + AlignmentReserve; - } - - static const size_t max_size() { - return ThreadLocalAllocBuffer::max_size(); - } + // Minimum PLAB size. + static size_t min_size(); + // Maximum PLAB size. + static size_t max_size(); // If an allocation of the given "word_sz" can be satisfied within the // buffer, do the allocation, returning a pointer to the start of the @@ -128,62 +130,37 @@ public: _allocated += word_sz(); } - // Flush the stats supporting ergonomic sizing of PLAB's - // and retire the current buffer. - void flush_stats_and_retire(PLABStats* stats, bool end_of_gc, bool retain) { - // We flush the stats first in order to get a reading of - // unused space in the last buffer. - if (ResizePLAB) { - flush_stats(stats); + // Flush allocation statistics into the given PLABStats supporting ergonomic + // sizing of PLAB's and retire the current buffer. To be called at the end of + // GC. + void flush_and_retire_stats(PLABStats* stats); - // Since we have flushed the stats we need to clear - // the _allocated and _wasted fields. Not doing so - // will artifically inflate the values in the stats - // to which we add them. - // The next time we flush these values, we will add - // what we have just flushed in addition to the size - // of the buffers allocated between now and then. - _allocated = 0; - _wasted = 0; - } - // Retire the last allocation buffer. - retire(end_of_gc, retain); - } - - // Force future allocations to fail and queries for contains() - // to return false - void invalidate() { - assert(!_retained, "Shouldn't retain an invalidated buffer."); - _end = _hard_end; - _wasted += pointer_delta(_end, _top); // unused space - _top = _end; // force future allocations to fail - _bottom = _end; // force future contains() queries to return false - } - - // Fills in the unallocated portion of the buffer with a garbage object. - // If "end_of_gc" is TRUE, is after the last use in the GC. IF "retain" - // is true, attempt to re-use the unused portion in the next GC. - virtual void retire(bool end_of_gc, bool retain); + // Fills in the unallocated portion of the buffer with a garbage object and updates + // statistics. To be called during GC. + virtual void retire(); void print() PRODUCT_RETURN; }; -// PLAB stats book-keeping +// PLAB book-keeping. class PLABStats VALUE_OBJ_CLASS_SPEC { - size_t _allocated; // total allocated + size_t _allocated; // Total allocated size_t _wasted; // of which wasted (internal fragmentation) size_t _unused; // Unused in last buffer - size_t _used; // derived = allocated - wasted - unused - size_t _desired_plab_sz;// output of filter (below), suitably trimmed and quantized + size_t _desired_plab_sz;// Output of filter (below), suitably trimmed and quantized AdaptiveWeightedAverage - _filter; // integrator with decay + _filter; // Integrator with decay + void reset() { + _allocated = 0; + _wasted = 0; + _unused = 0; + } public: PLABStats(size_t desired_plab_sz_, unsigned wt) : _allocated(0), _wasted(0), _unused(0), - _used(0), _desired_plab_sz(desired_plab_sz_), _filter(wt) { } @@ -200,9 +177,9 @@ class PLABStats VALUE_OBJ_CLASS_SPEC { return _desired_plab_sz; } + // Updates the current desired PLAB size. Computes the new desired PLAB size, + // updates _desired_plab_sz and clears sensor accumulators. void adjust_desired_plab_sz(uint no_of_gc_workers); - // filter computation, latches output to - // _desired_plab_sz, clears sensor accumulators void add_allocated(size_t v) { Atomic::add_ptr(v, &_allocated); From 810713095449d92c7f2e5a2630010f7c17660165 Mon Sep 17 00:00:00 2001 From: Jesper Wilhelmsson Date: Mon, 2 Mar 2015 16:19:59 +0100 Subject: [PATCH 56/97] 8071335: gc/TestSmallHeap.java throw OOM To avoid OOME, do not run with -Xcomp Reviewed-by: brutisso, tschatzl --- hotspot/test/gc/TestSmallHeap.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/test/gc/TestSmallHeap.java b/hotspot/test/gc/TestSmallHeap.java index abe6ed37f98..3b05574ac0d 100644 --- a/hotspot/test/gc/TestSmallHeap.java +++ b/hotspot/test/gc/TestSmallHeap.java @@ -26,6 +26,7 @@ * @bug 8067438 * @requires vm.gc=="null" * @requires (vm.opt.AggressiveOpts=="null") | (vm.opt.AggressiveOpts=="false") + * @requires vm.compMode != "Xcomp" * @summary Verify that starting the VM with a small heap works * @library /testlibrary /../../test/lib * @build TestSmallHeap From 12cd46edc95aec583c252f93141cda3e45cf30de Mon Sep 17 00:00:00 2001 From: "Daniel D. Daugherty" Date: Mon, 2 Mar 2015 16:31:25 -0800 Subject: [PATCH 57/97] 8072439: fix for 8047720 may need more work Cleanup PeriodTask_lock usage. Also reviewed by varming@gmail.com. Co-authored-by: Carsten Varming Reviewed-by: dholmes, dcubed, mgronlun, coleenp --- hotspot/src/share/vm/runtime/java.cpp | 8 +++-- hotspot/src/share/vm/runtime/task.cpp | 35 +++++++++++------- hotspot/src/share/vm/runtime/task.hpp | 4 ++- hotspot/src/share/vm/runtime/thread.cpp | 47 +++++++++++++------------ hotspot/src/share/vm/runtime/thread.hpp | 5 +-- 5 files changed, 59 insertions(+), 40 deletions(-) diff --git a/hotspot/src/share/vm/runtime/java.cpp b/hotspot/src/share/vm/runtime/java.cpp index 52018be409e..0263a501d12 100644 --- a/hotspot/src/share/vm/runtime/java.cpp +++ b/hotspot/src/share/vm/runtime/java.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -421,9 +421,11 @@ void before_exit(JavaThread * thread) { os::infinite_sleep(); } - // Terminate watcher thread - must before disenrolling any periodic task - if (PeriodicTask::num_tasks() > 0) + // Stop the WatcherThread. We do this before disenrolling various + // PeriodicTasks to reduce the likelihood of races. + if (PeriodicTask::num_tasks() > 0) { WatcherThread::stop(); + } // Print statistics gathered (profiling ...) if (Arguments::has_profile()) { diff --git a/hotspot/src/share/vm/runtime/task.cpp b/hotspot/src/share/vm/runtime/task.cpp index 0e6378c5548..de12a94b9ae 100644 --- a/hotspot/src/share/vm/runtime/task.cpp +++ b/hotspot/src/share/vm/runtime/task.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,6 +47,8 @@ void PeriodicTask::print_intervals() { #endif void PeriodicTask::real_time_tick(int delay_time) { + assert(Thread::current()->is_Watcher_thread(), "must be WatcherThread"); + #ifndef PRODUCT if (ProfilerCheckIntervals) { _ticks++; @@ -60,6 +62,8 @@ void PeriodicTask::real_time_tick(int delay_time) { #endif { + // The WatcherThread does not participate in the safepoint protocol + // for the PeriodicTask_lock because it is not a JavaThread. MutexLockerEx ml(PeriodicTask_lock, Mutex::_no_safepoint_check_flag); int orig_num_tasks = _num_tasks; @@ -74,8 +78,7 @@ void PeriodicTask::real_time_tick(int delay_time) { } int PeriodicTask::time_to_wait() { - MutexLockerEx ml(PeriodicTask_lock->owned_by_self() ? - NULL : PeriodicTask_lock, Mutex::_no_safepoint_check_flag); + assert(PeriodicTask_lock->owned_by_self(), "PeriodicTask_lock required"); if (_num_tasks == 0) { return 0; // sleep until shutdown or a task is enrolled @@ -98,14 +101,19 @@ PeriodicTask::PeriodicTask(size_t interval_time) : } PeriodicTask::~PeriodicTask() { + // This PeriodicTask may have already been disenrolled by a call + // to disenroll() before the PeriodicTask was deleted. disenroll(); } -/* enroll could be called from a JavaThread, so we have to check for - * safepoint when taking the lock to avoid deadlocking */ +// enroll the current PeriodicTask void PeriodicTask::enroll() { - MutexLockerEx ml(PeriodicTask_lock->owned_by_self() ? - NULL : PeriodicTask_lock); + // Follow normal safepoint aware lock enter protocol if the caller does + // not already own the PeriodicTask_lock. Otherwise, we don't try to + // enter it again because VM internal Mutexes do not support recursion. + // + MutexLockerEx ml(PeriodicTask_lock->owned_by_self() ? NULL + : PeriodicTask_lock); if (_num_tasks == PeriodicTask::max_tasks) { fatal("Overflow in PeriodicTask table"); @@ -113,18 +121,21 @@ void PeriodicTask::enroll() { _tasks[_num_tasks++] = this; WatcherThread* thread = WatcherThread::watcher_thread(); - if (thread) { + if (thread != NULL) { thread->unpark(); } else { WatcherThread::start(); } } -/* disenroll could be called from a JavaThread, so we have to check for - * safepoint when taking the lock to avoid deadlocking */ +// disenroll the current PeriodicTask void PeriodicTask::disenroll() { - MutexLockerEx ml(PeriodicTask_lock->owned_by_self() ? - NULL : PeriodicTask_lock); + // Follow normal safepoint aware lock enter protocol if the caller does + // not already own the PeriodicTask_lock. Otherwise, we don't try to + // enter it again because VM internal Mutexes do not support recursion. + // + MutexLockerEx ml(PeriodicTask_lock->owned_by_self() ? NULL + : PeriodicTask_lock); int index; for(index = 0; index < _num_tasks && _tasks[index] != this; index++) diff --git a/hotspot/src/share/vm/runtime/task.hpp b/hotspot/src/share/vm/runtime/task.hpp index 5fc8c16e2a4..c7181089ee2 100644 --- a/hotspot/src/share/vm/runtime/task.hpp +++ b/hotspot/src/share/vm/runtime/task.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -54,6 +54,7 @@ class PeriodicTask: public CHeapObj { static int _num_tasks; static PeriodicTask* _tasks[PeriodicTask::max_tasks]; + // Can only be called by the WatcherThread static void real_time_tick(int delay_time); #ifndef PRODUCT @@ -98,6 +99,7 @@ class PeriodicTask: public CHeapObj { // Calculate when the next periodic task will fire. // Called by the WatcherThread's run method. + // Requires the PeriodicTask_lock. static int time_to_wait(); // The task to perform at each period diff --git a/hotspot/src/share/vm/runtime/thread.cpp b/hotspot/src/share/vm/runtime/thread.cpp index 00e5f804588..722f9483e1e 100644 --- a/hotspot/src/share/vm/runtime/thread.cpp +++ b/hotspot/src/share/vm/runtime/thread.cpp @@ -1197,8 +1197,15 @@ WatcherThread::WatcherThread() : Thread(), _crash_protection(NULL) { } int WatcherThread::sleep() const { + // The WatcherThread does not participate in the safepoint protocol + // for the PeriodicTask_lock because it is not a JavaThread. MutexLockerEx ml(PeriodicTask_lock, Mutex::_no_safepoint_check_flag); + if (_should_terminate) { + // check for termination before we do any housekeeping or wait + return 0; // we did not sleep. + } + // remaining will be zero if there are no tasks, // causing the WatcherThread to sleep until a task is // enrolled @@ -1211,8 +1218,9 @@ int WatcherThread::sleep() const { jlong time_before_loop = os::javaTimeNanos(); - for (;;) { - bool timedout = PeriodicTask_lock->wait(Mutex::_no_safepoint_check_flag, remaining); + while (true) { + bool timedout = PeriodicTask_lock->wait(Mutex::_no_safepoint_check_flag, + remaining); jlong now = os::javaTimeNanos(); if (remaining == 0) { @@ -1253,7 +1261,7 @@ void WatcherThread::run() { this->initialize_thread_local_storage(); this->set_native_thread_name(this->name()); this->set_active_handles(JNIHandleBlock::allocate_block()); - while (!_should_terminate) { + while (true) { assert(watcher_thread() == Thread::current(), "thread consistency check"); assert(watcher_thread() == this, "thread consistency check"); @@ -1289,6 +1297,11 @@ void WatcherThread::run() { } } + if (_should_terminate) { + // check for termination before posting the next tick + break; + } + PeriodicTask::real_time_tick(time_waited); } @@ -1319,27 +1332,19 @@ void WatcherThread::make_startable() { } void WatcherThread::stop() { - // Get the PeriodicTask_lock if we can. If we cannot, then the - // WatcherThread is using it and we don't want to block on that lock - // here because that might cause a safepoint deadlock depending on - // what the current WatcherThread tasks are doing. - bool have_lock = PeriodicTask_lock->try_lock(); + { + // Follow normal safepoint aware lock enter protocol since the + // WatcherThread is stopped by another JavaThread. + MutexLocker ml(PeriodicTask_lock); + _should_terminate = true; - _should_terminate = true; - OrderAccess::fence(); // ensure WatcherThread sees update in main loop - - if (have_lock) { WatcherThread* watcher = watcher_thread(); if (watcher != NULL) { - // If we managed to get the lock, then we should unpark the - // WatcherThread so that it can see we want it to stop. + // unpark the WatcherThread so it can see that it should terminate watcher->unpark(); } - - PeriodicTask_lock->unlock(); } - // it is ok to take late safepoints here, if needed MutexLocker mu(Terminator_lock); while (watcher_thread() != NULL) { @@ -1359,9 +1364,7 @@ void WatcherThread::stop() { } void WatcherThread::unpark() { - MutexLockerEx ml(PeriodicTask_lock->owned_by_self() - ? NULL - : PeriodicTask_lock, Mutex::_no_safepoint_check_flag); + assert(PeriodicTask_lock->owned_by_self(), "PeriodicTask_lock required"); PeriodicTask_lock->notify(); } @@ -3558,8 +3561,8 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) { } { - MutexLockerEx ml(PeriodicTask_lock, Mutex::_no_safepoint_check_flag); - // Make sure the watcher thread can be started by WatcherThread::start() + MutexLocker ml(PeriodicTask_lock); + // Make sure the WatcherThread can be started by WatcherThread::start() // or by dynamic enrollment. WatcherThread::make_startable(); // Start up the WatcherThread if there are any periodic tasks diff --git a/hotspot/src/share/vm/runtime/thread.hpp b/hotspot/src/share/vm/runtime/thread.hpp index 399a2cbe671..7335cdae9f2 100644 --- a/hotspot/src/share/vm/runtime/thread.hpp +++ b/hotspot/src/share/vm/runtime/thread.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -701,7 +701,8 @@ class WatcherThread: public Thread { static WatcherThread* _watcher_thread; static bool _startable; - volatile static bool _should_terminate; // updated without holding lock + // volatile due to at least one lock-free read + volatile static bool _should_terminate; os::WatcherThreadCrashProtection* _crash_protection; public: From 2c277304d8c19c411716d45ffa22a965082cb636 Mon Sep 17 00:00:00 2001 From: Roland Westrelin Date: Tue, 3 Mar 2015 12:30:07 +0100 Subject: [PATCH 58/97] 8073957: assert(ary_src != 0) failed: not an array or instance? ArrayCopyNode going dead needs better validation of inputs Reviewed-by: kvn, vlivanov --- hotspot/src/share/vm/opto/arraycopynode.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/hotspot/src/share/vm/opto/arraycopynode.cpp b/hotspot/src/share/vm/opto/arraycopynode.cpp index c14e6ee6ee5..5542d7fc822 100644 --- a/hotspot/src/share/vm/opto/arraycopynode.cpp +++ b/hotspot/src/share/vm/opto/arraycopynode.cpp @@ -145,7 +145,6 @@ Node* ArrayCopyNode::try_clone_instance(PhaseGVN *phase, bool can_reshape, int c Node* in_mem = in(TypeFunc::Memory); const Type* src_type = phase->type(src); - const Type* dest_type = phase->type(dest); assert(src->is_AddP(), "should be base + off"); assert(dest->is_AddP(), "should be base + off"); @@ -483,7 +482,20 @@ Node *ArrayCopyNode::Ideal(PhaseGVN *phase, bool can_reshape) { return NULL; } - if (in(TypeFunc::Control)->is_top() || in(TypeFunc::Memory)->is_top()) { + assert(in(TypeFunc::Control) != NULL && + in(TypeFunc::Memory) != NULL && + in(ArrayCopyNode::Src) != NULL && + in(ArrayCopyNode::Dest) != NULL && + in(ArrayCopyNode::Length) != NULL && + ((in(ArrayCopyNode::SrcPos) != NULL && in(ArrayCopyNode::DestPos) != NULL) || + is_clonebasic()), "broken inputs"); + + if (in(TypeFunc::Control)->is_top() || + in(TypeFunc::Memory)->is_top() || + phase->type(in(ArrayCopyNode::Src)) == Type::TOP || + phase->type(in(ArrayCopyNode::Dest)) == Type::TOP || + (in(ArrayCopyNode::SrcPos) != NULL && in(ArrayCopyNode::SrcPos)->is_top()) || + (in(ArrayCopyNode::DestPos) != NULL && in(ArrayCopyNode::DestPos)->is_top())) { return NULL; } From 8c5e105bac4f145472ce490ac6632b790c3be222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= Date: Tue, 3 Mar 2015 20:17:07 +0100 Subject: [PATCH 59/97] 8073042: jcmd hangs until another jcmd is executed (which, in turn also hangs) Reviewed-by: jbachorik, dsamersoff, farvidsson --- .../os/windows/vm/attachListener_windows.cpp | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/hotspot/src/os/windows/vm/attachListener_windows.cpp b/hotspot/src/os/windows/vm/attachListener_windows.cpp index 3b3d0ca9d08..916118eb9fa 100644 --- a/hotspot/src/os/windows/vm/attachListener_windows.cpp +++ b/hotspot/src/os/windows/vm/attachListener_windows.cpp @@ -62,7 +62,7 @@ class Win32AttachOperation; class Win32AttachListener: AllStatic { private: enum { - preallocate_count = 4 // number of preallocated operations + max_enqueued_operations = 4 }; // protects the preallocated list and the operation list @@ -83,9 +83,12 @@ class Win32AttachListener: AllStatic { static void set_tail(Win32AttachOperation* tail) { _tail = tail; } - // used to wakeup the listener - static HANDLE _wakeup; - static HANDLE wakeup() { return _wakeup; } + // A semaphore is used for communication about enqueued operations. + // The maximum count for the semaphore object will be set to "max_enqueued_operations". + // The state of a semaphore is signaled when its count is greater than + // zero (there are operations enqueued), and nonsignaled when it is zero. + static HANDLE _enqueued_ops_semaphore; + static HANDLE enqueued_ops_semaphore() { return _enqueued_ops_semaphore; } public: enum { @@ -110,7 +113,7 @@ class Win32AttachListener: AllStatic { // statics HANDLE Win32AttachListener::_mutex; -HANDLE Win32AttachListener::_wakeup; +HANDLE Win32AttachListener::_enqueued_ops_semaphore; Win32AttachOperation* Win32AttachListener::_avail; Win32AttachOperation* Win32AttachListener::_head; Win32AttachOperation* Win32AttachListener::_tail; @@ -155,20 +158,19 @@ class Win32AttachOperation: public AttachOperation { }; -// preallocate the required number of operations +// Preallocate the maximum number of operations that can be enqueued. int Win32AttachListener::init() { _mutex = (void*)::CreateMutex(NULL, FALSE, NULL); guarantee(_mutex != (HANDLE)NULL, "mutex creation failed"); - _wakeup = ::CreateSemaphore(NULL, 0, 1, NULL); - guarantee(_wakeup != (HANDLE)NULL, "semaphore creation failed"); + _enqueued_ops_semaphore = ::CreateSemaphore(NULL, 0, max_enqueued_operations, NULL); + guarantee(_enqueued_ops_semaphore != (HANDLE)NULL, "semaphore creation failed"); set_head(NULL); set_tail(NULL); - - // preallocate a few operations set_available(NULL); - for (int i=0; iset_next(available()); set_available(op); @@ -221,8 +223,12 @@ int Win32AttachListener::enqueue(char* cmd, char* arg0, char* arg1, char* arg2, op->set_arg(2, arg2); op->set_pipe(pipename); - // wakeup the thread waiting for operations - ::ReleaseSemaphore(wakeup(), 1, NULL); + // Increment number of enqueued operations. + // Side effect: Semaphore will be signaled and will release + // any blocking waiters (i.e. the AttachListener thread). + BOOL not_exceeding_semaphore_maximum_count = + ::ReleaseSemaphore(enqueued_ops_semaphore(), 1, NULL); + guarantee(not_exceeding_semaphore_maximum_count, "invariant"); } ::ReleaseMutex(mutex()); @@ -230,10 +236,12 @@ int Win32AttachListener::enqueue(char* cmd, char* arg0, char* arg1, char* arg2, } -// dequeue the operation from the head of the operation list. If +// dequeue the operation from the head of the operation list. Win32AttachOperation* Win32AttachListener::dequeue() { for (;;) { - DWORD res = ::WaitForSingleObject(wakeup(), INFINITE); + DWORD res = ::WaitForSingleObject(enqueued_ops_semaphore(), INFINITE); + // returning from WaitForSingleObject will have decreased + // the current count of the semaphore by 1. guarantee(res == WAIT_OBJECT_0, "wait failed"); res = ::WaitForSingleObject(mutex(), INFINITE); From 0401cdb946fd425fe5f4c3babf9935bd404c5f88 Mon Sep 17 00:00:00 2001 From: Kim Barrett Date: Wed, 4 Mar 2015 02:23:38 +0100 Subject: [PATCH 60/97] 8074319: barrier_set_cast defined via friend injection Changed the in-class definition to a friend declaration and move the definition to namespace scope Reviewed-by: jwilhelm, simonis --- hotspot/src/share/vm/memory/barrierSet.hpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hotspot/src/share/vm/memory/barrierSet.hpp b/hotspot/src/share/vm/memory/barrierSet.hpp index 5d872fec064..12591db754b 100644 --- a/hotspot/src/share/vm/memory/barrierSet.hpp +++ b/hotspot/src/share/vm/memory/barrierSet.hpp @@ -68,11 +68,7 @@ private: // Downcast argument to a derived barrier set type. // The cast is checked in a debug build. // T must have a specialization for BarrierSet::GetName. - template - friend T* barrier_set_cast(BarrierSet* bs) { - assert(bs->is_a(BarrierSet::GetName::value), "wrong type of barrier set"); - return static_cast(bs); - } + template friend T* barrier_set_cast(BarrierSet* bs); public: // Note: This is not presently the Name corresponding to the @@ -216,4 +212,10 @@ public: virtual void print_on(outputStream* st) const = 0; }; +template +inline T* barrier_set_cast(BarrierSet* bs) { + assert(bs->is_a(BarrierSet::GetName::value), "wrong type of barrier set"); + return static_cast(bs); +} + #endif // SHARE_VM_MEMORY_BARRIERSET_HPP From c4df8e24bcef4bdd87e4b03e63ca9c6e618693fa Mon Sep 17 00:00:00 2001 From: Staffan Larsen Date: Thu, 5 Mar 2015 11:39:15 +0100 Subject: [PATCH 61/97] 8058470: [jconsole] VM Summary Tab is blank for JDK9's jconsole Reviewed-by: erikj --- make/common/JavaCompilation.gmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk index 41f1f0745da..d2bad5e88de 100644 --- a/make/common/JavaCompilation.gmk +++ b/make/common/JavaCompilation.gmk @@ -393,7 +393,7 @@ define add_file_to_clean $(MKDIR) -p $$(@D) export LC_ALL=C ; ( $(CAT) $$< && $(ECHO) "" ) \ | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' \ - -e 's/\([^\\]\)!/\1\\!/g' -e 's/#.*/#/g' \ + -e 's/\([^\\]\)!/\1\\!/g' -e 's/^[ ]*#.*/#/g' \ | $(SED) -f "$(SRC_ROOT)/make/common/support/unicode2x.sed" \ | $(SED) -e '/^#/d' -e '/^$$$$/d' \ -e :a -e '/\\$$$$/N; s/\\\n//; ta' \ From a953097a8960cd0013fa28ddc7ee54277a82fb67 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Thu, 5 Mar 2015 17:18:19 -0800 Subject: [PATCH 62/97] 8049378: Examine references to ${java.home}/lib in JAXP Reviewed-by: lancea, alanb --- .../share/classes/javax/xml/XMLConstants.java | 26 ++++--- .../javax/xml/datatype/DatatypeFactory.java | 54 ++++++++------ .../xml/parsers/DocumentBuilderFactory.java | 71 ++++++++++--------- .../javax/xml/parsers/SAXParserFactory.java | 54 ++++++++------ .../javax/xml/stream/XMLEventFactory.java | 62 +++++++++++----- .../javax/xml/stream/XMLInputFactory.java | 59 +++++++++++---- .../javax/xml/stream/XMLOutputFactory.java | 63 +++++++++++----- .../xml/transform/TransformerFactory.java | 67 +++++++++-------- .../javax/xml/validation/SchemaFactory.java | 30 +++++--- .../classes/javax/xml/xpath/XPathFactory.java | 71 +++++++++++-------- 10 files changed, 356 insertions(+), 201 deletions(-) diff --git a/jaxp/src/java.xml/share/classes/javax/xml/XMLConstants.java b/jaxp/src/java.xml/share/classes/javax/xml/XMLConstants.java index 4cb5800200d..cca303c5d66 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/XMLConstants.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/XMLConstants.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -247,9 +247,11 @@ public final class XMLConstants { *

* *

- * ${JAVA_HOME}/conf/jaxp.properties: This configuration file is in standard - * {@link java.util.Properties} format. If the file exists and the system property is specified, - * its value will be used to override the default of the property. + * jaxp.properties: This configuration file is in standard + * {@link java.util.Properties} format and typically located in the {@code conf} + * directory of the Java installation. If the file exists and the system + * property is specified, its value will be used to override the default + * of the property. *

* *

@@ -314,9 +316,11 @@ public final class XMLConstants { *

* *

- * ${JAVA_HOME}/conf/jaxp.properties: This configuration file is in standard - * java.util.Properties format. If the file exists and the system property is specified, - * its value will be used to override the default of the property. + * jaxp.properties: This configuration file is in standard + * {@link java.util.Properties} format and typically located in the {@code conf} + * directory of the Java installation. If the file exists and the system + * property is specified, its value will be used to override the default + * of the property. * * @since 1.7 *

@@ -380,9 +384,11 @@ public final class XMLConstants { *

* *

- * ${JAVA_HOME}/conf/jaxp.properties: This configuration file is in standard - * java.util.Properties format. If the file exists and the system property is specified, - * its value will be used to override the default of the property. + * jaxp.properties: This configuration file is in standard + * {@link java.util.Properties} format and typically located in the {@code conf} + * directory of the Java installation. If the file exists and the system + * property is specified, its value will be used to override the default + * of the property. * * @since 1.7 */ diff --git a/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java index de6050ac4e8..d3afb25888e 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,23 +32,34 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** - *

Factory that creates new javax.xml.datatype Objects that map XML to/from Java Objects.

- * - *

A new instance of the DatatypeFactory is created through the {@link #newInstance()} method - * that uses the following implementation resolution mechanisms to determine an implementation:

+ * Factory that creates new javax.xml.datatype Objects that map XML to/from Java Objects. + *

+ * A new instance of the {@code DatatypeFactory} is created through the {@link #newInstance()} method + * that uses the following implementation resolution mechanisms to determine an implementation: + *

*

    *
  1. - * If the system property specified by {@link #DATATYPEFACTORY_PROPERTY}, "javax.xml.datatype.DatatypeFactory", + * If the system property specified by {@link #DATATYPEFACTORY_PROPERTY}, "{@code javax.xml.datatype.DatatypeFactory}", * exists, a class with the name of the property value is instantiated. * Any Exception thrown during the instantiation process is wrapped as a {@link DatatypeConfigurationException}. *
    2. *
  2. - * If the file ${JAVA_HOME}/conf/jaxp.properties exists, it is loaded in a {@link java.util.Properties} Object. - * The Properties Object is then queried for the property as documented in the prior step - * and processed as documented in the prior step. + *

    + * Use the configuration file "jaxp.properties". The file is in standard + * {@link java.util.Properties} format and typically located in the + * {@code conf} directory of the Java installation. It contains the fully qualified + * name of the implementation class with the key being the system property + * defined above. + *

    + * The jaxp.properties file is read only once by the JAXP implementation + * and its values are then cached for future use. If the file does not exist + * when the first attempt is made to read from it, no further attempts are + * made to check for its existence. It is not possible to change the value + * of any property in jaxp.properties after it has been read for the first time. *

    3. *
  3. - * Uses the service-provider loading facilities, defined by the {@link java.util.ServiceLoader} class, to attempt + *

    + * Use the service-provider loading facility, defined by the {@link java.util.ServiceLoader} class, to attempt * to locate and load an implementation of the service using the {@linkplain * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: * the service-provider loading facility will use the {@linkplain @@ -56,13 +67,14 @@ import java.util.regex.Pattern; * to attempt to load the service. If the context class * loader is null, the {@linkplain * ClassLoader#getSystemClassLoader() system class loader} will be used. - *
    + *

    * In case of {@link java.util.ServiceConfigurationError service - * configuration error} a {@link javax.xml.datatype.DatatypeConfigurationException} + * configuration error}, a {@link javax.xml.datatype.DatatypeConfigurationException} * will be thrown. *

    4. *
  4. - * The final mechanism is to attempt to instantiate the Class specified by + *

    + * The final mechanism is to attempt to instantiate the {@code Class} specified by * {@link #DATATYPEFACTORY_IMPLEMENTATION_CLASS}. * Any Exception thrown during the instantiation process is wrapped as a {@link DatatypeConfigurationException}. *

    5. @@ -79,7 +91,7 @@ public abstract class DatatypeFactory { /** *

    Default property name as defined in JSR 206: Java(TM) API for XML Processing (JAXP) 1.3.

    * - *

    Default value is javax.xml.datatype.DatatypeFactory.

    + *

    Default value is {@code javax.xml.datatype.DatatypeFactory}.

    */ public static final String DATATYPEFACTORY_PROPERTY = // We use a String constant here, rather than calling @@ -120,18 +132,18 @@ public abstract class DatatypeFactory { /** *

    Protected constructor to prevent instantiation outside of package.

    * - *

    Use {@link #newInstance()} to create a DatatypeFactory.

    + *

    Use {@link #newInstance()} to create a {@code DatatypeFactory}.

    */ protected DatatypeFactory() { } /** - *

    Obtain a new instance of a DatatypeFactory.

    + *

    Obtain a new instance of a {@code DatatypeFactory}.

    * *

    The implementation resolution mechanisms are defined in this * Class's documentation.

    * - * @return New instance of a DatatypeFactory + * @return New instance of a {@code DatatypeFactory} * * @throws DatatypeConfigurationException If the implementation is not * available or cannot be instantiated. @@ -149,12 +161,12 @@ public abstract class DatatypeFactory { } /** - *

    Obtain a new instance of a DatatypeFactory from class name. + *

    Obtain a new instance of a {@code DatatypeFactory} from class name. * This function is useful when there are multiple providers in the classpath. * It gives more control to the application as it can specify which provider * should be loaded.

    * - *

    Once an application has obtained a reference to a DatatypeFactory + *

    Once an application has obtained a reference to a {@code DatatypeFactory} * it can use the factory to configure and obtain datatype instances.

    * * @@ -168,12 +180,12 @@ public abstract class DatatypeFactory { * java -Djaxp.debug=1 YourProgram .... * * - * @param factoryClassName fully qualified factory class name that provides implementation of javax.xml.datatype.DatatypeFactory. + * @param factoryClassName fully qualified factory class name that provides implementation of {@code javax.xml.datatype.DatatypeFactory}. * * @param classLoader ClassLoader used to load the factory class. If null * current Thread's context classLoader is used to load the factory class. * - * @return New instance of a DatatypeFactory + * @return New instance of a {@code DatatypeFactory} * * @throws DatatypeConfigurationException if factoryClassName is null, or * the factory class cannot be loaded, instantiated. diff --git a/jaxp/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java index 62bd3bd27c0..c500869cd7f 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -55,31 +55,34 @@ public abstract class DocumentBuilderFactory { /** * Obtain a new instance of a - * DocumentBuilderFactory. This static method creates + * {@code DocumentBuilderFactory}. This static method creates * a new factory instance. * This method uses the following ordered lookup procedure to determine - * the DocumentBuilderFactory implementation class to + * the {@code DocumentBuilderFactory} implementation class to * load: + *

    *

      *
    • - * Use the javax.xml.parsers.DocumentBuilderFactory system + * Use the {@code javax.xml.parsers.DocumentBuilderFactory} system * property. *
      • *
    • - * Use the properties file "conf/jaxp.properties" in the JRE directory. - * This configuration file is in standard java.util.Properties - * format and contains the fully qualified name of the - * implementation class with the key being the system property defined - * above. - * + *

      + * Use the configuration file "jaxp.properties". The file is in standard + * {@link java.util.Properties} format and typically located in the + * {@code conf} directory of the Java installation. It contains the fully qualified + * name of the implementation class with the key being the system property + * defined above. + *

      * The jaxp.properties file is read only once by the JAXP implementation - * and it's values are then cached for future use. If the file does not exist + * and its values are then cached for future use. If the file does not exist * when the first attempt is made to read from it, no further attempts are * made to check for its existence. It is not possible to change the value * of any property in jaxp.properties after it has been read for the first time. *

      • *
    • - * Uses the service-provider loading facilities, defined by the + *

      + * Use the service-provider loading facility, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an * implementation of the service using the {@linkplain * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: @@ -90,26 +93,30 @@ public abstract class DocumentBuilderFactory { * ClassLoader#getSystemClassLoader() system class loader} will be used. *

      • *
    • + *

      * Otherwise, the system-default implementation is returned. *

      • *
    * + *

    * Once an application has obtained a reference to a - * DocumentBuilderFactory it can use the factory to + * {@code DocumentBuilderFactory} it can use the factory to * configure and obtain parser instances. * * *

    Tip for Trouble-shooting

    - *

    Setting the jaxp.debug system property will cause + *

    + * Setting the {@code jaxp.debug} system property will cause * this method to print a lot of debug messages - * to System.err about what it is doing and where it is looking at.

    + * to {@code System.err} about what it is doing and where it is looking at. * - *

    If you have problems loading {@link DocumentBuilder}s, try:

    + *

    + * If you have problems loading {@link DocumentBuilder}s, try: * 

          * java -Djaxp.debug=1 YourProgram ....
      *
    * - * @return New instance of a DocumentBuilderFactory + * @return New instance of a {@code DocumentBuilderFactory} * * @throws FactoryConfigurationError in case of {@linkplain * java.util.ServiceConfigurationError service configuration error} or if @@ -124,31 +131,31 @@ public abstract class DocumentBuilderFactory { } /** - *

    Obtain a new instance of a DocumentBuilderFactory from class name. + *

    Obtain a new instance of a {@code DocumentBuilderFactory} from class name. * This function is useful when there are multiple providers in the classpath. * It gives more control to the application as it can specify which provider - * should be loaded.

    + * should be loaded. * - *

    Once an application has obtained a reference to a DocumentBuilderFactory - * it can use the factory to configure and obtain parser instances.

    + *

    Once an application has obtained a reference to a {@code DocumentBuilderFactory} + * it can use the factory to configure and obtain parser instances. * * *

    Tip for Trouble-shooting

    - *

    Setting the jaxp.debug system property will cause + *

    Setting the {@code jaxp.debug} system property will cause * this method to print a lot of debug messages - * to System.err about what it is doing and where it is looking at.

    + * to {@code System.err} about what it is doing and where it is looking at.

    * *

    If you have problems try:

    * 
          * java -Djaxp.debug=1 YourProgram ....
      *
    * - * @param factoryClassName fully qualified factory class name that provides implementation of javax.xml.parsers.DocumentBuilderFactory. + * @param factoryClassName fully qualified factory class name that provides implementation of {@code javax.xml.parsers.DocumentBuilderFactory}. * * @param classLoader ClassLoader used to load the factory class. If null * current Thread's context classLoader is used to load the factory class. * - * @return New instance of a DocumentBuilderFactory + * @return New instance of a {@code DocumentBuilderFactory} * * @throws FactoryConfigurationError if factoryClassName is null, or * the factory class cannot be loaded, instantiated. @@ -406,14 +413,14 @@ public abstract class DocumentBuilderFactory { throws IllegalArgumentException; /** - *

    Set a feature for this DocumentBuilderFactory and DocumentBuilders created by this factory.

    + *

    Set a feature for this {@code DocumentBuilderFactory} and DocumentBuilders created by this factory.

    * *

    * Feature names are fully qualified {@link java.net.URI}s. * Implementations may define their own features. - * A {@link ParserConfigurationException} is thrown if this DocumentBuilderFactory or the + * A {@link ParserConfigurationException} is thrown if this {@code DocumentBuilderFactory} or the * DocumentBuilders it creates cannot support the feature. - * It is possible for a DocumentBuilderFactory to expose a feature value but be unable to change its state. + * It is possible for a {@code DocumentBuilderFactory} to expose a feature value but be unable to change its state. *

    * *

    @@ -436,7 +443,7 @@ public abstract class DocumentBuilderFactory { * @param name Feature name. * @param value Is feature state true or false. * - * @throws ParserConfigurationException if this DocumentBuilderFactory or the DocumentBuilders + * @throws ParserConfigurationException if this {@code DocumentBuilderFactory} or the DocumentBuilders * it creates cannot support this feature. * @throws NullPointerException If the name parameter is null. * @since 1.5 @@ -450,16 +457,16 @@ public abstract class DocumentBuilderFactory { *

    * Feature names are fully qualified {@link java.net.URI}s. * Implementations may define their own features. - * An {@link ParserConfigurationException} is thrown if this DocumentBuilderFactory or the + * An {@link ParserConfigurationException} is thrown if this {@code DocumentBuilderFactory} or the * DocumentBuilders it creates cannot support the feature. - * It is possible for an DocumentBuilderFactory to expose a feature value but be unable to change its state. + * It is possible for an {@code DocumentBuilderFactory} to expose a feature value but be unable to change its state. *

    * * @param name Feature name. * * @return State of the named feature. * - * @throws ParserConfigurationException if this DocumentBuilderFactory + * @throws ParserConfigurationException if this {@code DocumentBuilderFactory} * or the DocumentBuilders it creates cannot support this feature. * @since 1.5 */ diff --git a/jaxp/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java index f2e9120a02f..1160a62edf4 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -59,31 +59,34 @@ public abstract class SAXParserFactory { } /** - * Obtain a new instance of a SAXParserFactory. This + * Obtain a new instance of a {@code SAXParserFactory}. This * static method creates a new factory instance * This method uses the following ordered lookup procedure to determine - * the SAXParserFactory implementation class to + * the {@code SAXParserFactory} implementation class to * load: + *

    *

      *
    • - * Use the javax.xml.parsers.SAXParserFactory system + * Use the {@code javax.xml.parsers.SAXParserFactory} system * property. *
      • *
    • - * Use the properties file "conf/jaxp.properties" in the JRE directory. - * This configuration file is in standard java.util.Properties - * format and contains the fully qualified name of the - * implementation class with the key being the system property defined - * above. - * + *

      + * Use the configuration file "jaxp.properties". The file is in standard + * {@link java.util.Properties} format and typically located in the + * {@code conf} directory of the Java installation. It contains the fully qualified + * name of the implementation class with the key being the system property + * defined above. + *

      * The jaxp.properties file is read only once by the JAXP implementation - * and it's values are then cached for future use. If the file does not exist + * and its values are then cached for future use. If the file does not exist * when the first attempt is made to read from it, no further attempts are * made to check for its existence. It is not possible to change the value * of any property in jaxp.properties after it has been read for the first time. *

      • *
    • - * Use the service-provider loading facilities, defined by the + *

      + * Use the service-provider loading facility, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an * implementation of the service using the {@linkplain * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: @@ -94,22 +97,26 @@ public abstract class SAXParserFactory { * ClassLoader#getSystemClassLoader() system class loader} will be used. *

      • *
    • + *

      * Otherwise the system-default implementation is returned. *

      • *
    * + *

    * Once an application has obtained a reference to a - * SAXParserFactory it can use the factory to + * {@code SAXParserFactory} it can use the factory to * configure and obtain parser instances. * * * *

    Tip for Trouble-shooting

    - *

    Setting the jaxp.debug system property will cause + *

    + * Setting the {@code jaxp.debug} system property will cause * this method to print a lot of debug messages - * to System.err about what it is doing and where it is looking at.

    + * to {@code System.err} about what it is doing and where it is looking at. * - *

    If you have problems loading {@link SAXParser}s, try:

    + *

    + * If you have problems loading {@link SAXParser}s, try: * 

          * java -Djaxp.debug=1 YourProgram ....
      *
    @@ -131,31 +138,32 @@ public abstract class SAXParserFactory { } /** - *

    Obtain a new instance of a SAXParserFactory from class name. + *

    Obtain a new instance of a {@code SAXParserFactory} from class name. * This function is useful when there are multiple providers in the classpath. * It gives more control to the application as it can specify which provider * should be loaded.

    * - *

    Once an application has obtained a reference to a SAXParserFactory + *

    Once an application has obtained a reference to a {@code SAXParserFactory} * it can use the factory to configure and obtain parser instances.

    * * *

    Tip for Trouble-shooting

    - *

    Setting the jaxp.debug system property will cause + *

    Setting the {@code jaxp.debug} system property will cause * this method to print a lot of debug messages - * to System.err about what it is doing and where it is looking at.

    + * to {@code System.err} about what it is doing and where it is looking at.

    * - *

    If you have problems, try:

    + *

    + * If you have problems, try: * 

          * java -Djaxp.debug=1 YourProgram ....
      *
    * - * @param factoryClassName fully qualified factory class name that provides implementation of javax.xml.parsers.SAXParserFactory. + * @param factoryClassName fully qualified factory class name that provides implementation of {@code javax.xml.parsers.SAXParserFactory}. * * @param classLoader ClassLoader used to load the factory class. If null * current Thread's context classLoader is used to load the factory class. * - * @return New instance of a SAXParserFactory + * @return New instance of a {@code SAXParserFactory} * * @throws FactoryConfigurationError if factoryClassName is null, or * the factory class cannot be loaded, instantiated. diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventFactory.java index 548feeb272a..fc14bc620bc 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventFactory.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventFactory.java @@ -23,7 +23,7 @@ */ /* - * Copyright (c) 2009, 2013, by Oracle Corporation. All Rights Reserved. + * Copyright (c) 2009, 2015, by Oracle Corporation. All Rights Reserved. */ package javax.xml.stream; @@ -70,19 +70,34 @@ public abstract class XMLEventFactory { * This static method creates a new factory instance. * This method uses the following ordered lookup procedure to determine * the XMLEventFactory implementation class to load: - *

    + *

    *

      *
    • * Use the javax.xml.stream.XMLEventFactory system property. *
      • *
    • - * Use the properties file "lib/stax.properties" in the JRE directory. - * This configuration file is in standard java.util.Properties format - * and contains the fully qualified name of the implementation class - * with the key being the system property defined above. + *

      + * Use the configuration file "stax.properties". The file is in standard + * {@link java.util.Properties} format and typically located in the + * {@code conf} directory of the Java installation. It contains the fully qualified + * name of the implementation class with the key being the system property + * defined above. + * + *

      + * The stax.properties file is read only once by the implementation + * and its values are then cached for future use. If the file does not exist + * when the first attempt is made to read from it, no further attempts are + * made to check for its existence. It is not possible to change the value + * of any property in stax.properties after it has been read for the first time. + * + *

      + * Use the jaxp configuration file "jaxp.properties". The file is in the same + * format as stax.properties and will only be read if stax.properties does + * not exist. *

      • *
    • - * Use the service-provider loading facilities, defined by the + *

      + * Use the service-provider loading facility, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an * implementation of the service using the {@linkplain * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: @@ -93,18 +108,18 @@ public abstract class XMLEventFactory { * ClassLoader#getSystemClassLoader() system class loader} will be used. *

      • *
    • + *

      * Otherwise, the system-default implementation is returned. *

      • *
    *

    * Once an application has obtained a reference to a XMLEventFactory it * can use the factory to configure and obtain stream instances. - *

    *

    * Note that this is a new method that replaces the deprecated newInstance() method. * No changes in behavior are defined by this replacement method relative to * the deprecated method. - *

    + * * @throws FactoryConfigurationError in case of {@linkplain * java.util.ServiceConfigurationError service configuration error} or if * the implementation is not available or cannot be instantiated. @@ -143,20 +158,35 @@ public abstract class XMLEventFactory { *

    * This method uses the following ordered lookup procedure to determine * the XMLEventFactory implementation class to load: - *

    + *

    *

      *
    • * Use the value of the system property identified by {@code factoryId}. *
      • *
    • - * Use the properties file "lib/stax.properties" in the JRE directory. - * This configuration file is in standard java.util.Properties format - * and contains the fully qualified name of the implementation class - * with the key being the given {@code factoryId}. + *

      + * Use the configuration file "stax.properties". The file is in standard + * {@link java.util.Properties} format and typically located in the + * conf directory of the Java installation. It contains the fully qualified + * name of the implementation class with the key being the system property + * defined above. + * + *

      + * The stax.properties file is read only once by the implementation + * and its values are then cached for future use. If the file does not exist + * when the first attempt is made to read from it, no further attempts are + * made to check for its existence. It is not possible to change the value + * of any property in stax.properties after it has been read for the first time. + * + *

      + * Use the jaxp configuration file "jaxp.properties". The file is in the same + * format as stax.properties and will only be read if stax.properties does + * not exist. *

      • *
    • + *

      * If {@code factoryId} is "javax.xml.stream.XMLEventFactory", - * use the service-provider loading facilities, defined by the + * use the service-provider loading facility, defined by the * {@link java.util.ServiceLoader} class, to attempt to {@linkplain * java.util.ServiceLoader#load(java.lang.Class, java.lang.ClassLoader) locate and load} * an implementation of the service using the specified {@code ClassLoader}. @@ -169,6 +199,7 @@ public abstract class XMLEventFactory { * ClassLoader#getSystemClassLoader() system class loader} will be used. *

      • *
    • + *

      * Otherwise, throws a {@link FactoryConfigurationError}. *

      • *
    @@ -179,7 +210,6 @@ public abstract class XMLEventFactory { * newInstance(String factoryId, ClassLoader classLoader)} method. * No changes in behavior are defined by this replacement method relative * to the deprecated method. - *

    * * @apiNote The parameter factoryId defined here is inconsistent with that * of other JAXP factories where the first parameter is fully qualified diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java index 20af7a052b2..90030378467 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java @@ -68,7 +68,7 @@ import javax.xml.transform.Source; * * * @version 1.2 - * @author Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. + * @author Copyright (c) 2009, 2015 by Oracle Corporation. All Rights Reserved. * @see XMLOutputFactory * @see XMLEventReader * @see XMLStreamReader @@ -163,16 +163,28 @@ public abstract class XMLInputFactory { *

    *
      *
    • - * Use the javax.xml.stream.XMLInputFactory system property. + *

      Use the javax.xml.stream.XMLInputFactory system property. *

      • *
    • - * Use the properties file "lib/stax.properties" in the JRE directory. - * This configuration file is in standard java.util.Properties format - * and contains the fully qualified name of the implementation class - * with the key being the system property defined above. + *

      Use the configuration file "stax.properties". The file is in standard + * {@link java.util.Properties} format and typically located in the + * {@code conf} directory of the Java installation. It contains the fully qualified + * name of the implementation class with the key being the system property + * defined above. + * + *

      The stax.properties file is read only once by the implementation + * and its values are then cached for future use. If the file does not exist + * when the first attempt is made to read from it, no further attempts are + * made to check for its existence. It is not possible to change the value + * of any property in stax.properties after it has been read for the first time. + * + *

      + * Use the jaxp configuration file "jaxp.properties". The file is in the same + * format as stax.properties and will only be read if stax.properties does + * not exist. *

      • *
    • - * Use the service-provider loading facilities, defined by the + *

      Use the service-provider loading facility, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an * implementation of the service using the {@linkplain * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: @@ -183,7 +195,7 @@ public abstract class XMLInputFactory { * ClassLoader#getSystemClassLoader() system class loader} will be used. *

      • *
    • - * Otherwise, the system-default implementation is returned. + *

      Otherwise, the system-default implementation is returned. *

      • *
    *

    @@ -233,20 +245,36 @@ public abstract class XMLInputFactory { *

    * This method uses the following ordered lookup procedure to determine * the XMLInputFactory implementation class to load: - *

    + *

    *

      *
    • + *

      * Use the value of the system property identified by {@code factoryId}. *

      • *
    • - * Use the properties file "lib/stax.properties" in the JRE directory. - * This configuration file is in standard java.util.Properties format - * and contains the fully qualified name of the implementation class - * with the key being the given {@code factoryId}. + *

      + * Use the configuration file "stax.properties". The file is in standard + * {@link java.util.Properties} format and typically located in the + * {@code conf} directory of the Java installation. It contains the fully qualified + * name of the implementation class with the key being the system property + * defined above. + * + *

      + * The stax.properties file is read only once by the implementation + * and its values are then cached for future use. If the file does not exist + * when the first attempt is made to read from it, no further attempts are + * made to check for its existence. It is not possible to change the value + * of any property in stax.properties after it has been read for the first time. + * + *

      + * Use the jaxp configuration file "jaxp.properties". The file is in the same + * format as stax.properties and will only be read if stax.properties does + * not exist. *

      • *
    • + *

      * If {@code factoryId} is "javax.xml.stream.XMLInputFactory", - * use the service-provider loading facilities, defined by the + * use the service-provider loading facility, defined by the * {@link java.util.ServiceLoader} class, to attempt to {@linkplain * java.util.ServiceLoader#load(java.lang.Class, java.lang.ClassLoader) locate and load} * an implementation of the service using the specified {@code ClassLoader}. @@ -259,6 +287,7 @@ public abstract class XMLInputFactory { * ClassLoader#getSystemClassLoader() system class loader} will be used. *

      • *
    • + *

      * Otherwise, throws a {@link FactoryConfigurationError}. *

      • *
    @@ -269,7 +298,7 @@ public abstract class XMLInputFactory { * newInstance(String factoryId, ClassLoader classLoader)} method. * No changes in behavior are defined by this replacement method relative * to the deprecated method. - *

    + * * * @apiNote The parameter factoryId defined here is inconsistent with that * of other JAXP factories where the first parameter is fully qualified diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java index e875ac2c277..4524a4e8315 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java @@ -102,7 +102,7 @@ import javax.xml.transform.Result; * namespace URI of the element or attribute using that prefix.

    * * @version 1.2 - * @author Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. + * @author Copyright (c) 2009, 2015 by Oracle Corporation. All Rights Reserved. * @see XMLInputFactory * @see XMLEventWriter * @see XMLStreamWriter @@ -136,19 +136,34 @@ public abstract class XMLOutputFactory { * This static method creates a new factory instance. This method uses the * following ordered lookup procedure to determine the XMLOutputFactory * implementation class to load: - *

    + *

    *

      *
    • * Use the javax.xml.stream.XMLOutputFactory system property. *
      • *
    • - * Use the properties file "lib/stax.properties" in the JRE directory. - * This configuration file is in standard java.util.Properties format - * and contains the fully qualified name of the implementation class - * with the key being the system property defined above. + *

      + * Use the configuration file "stax.properties". The file is in standard + * {@link java.util.Properties} format and typically located in the + * {@code conf} directory of the Java installation. It contains the fully qualified + * name of the implementation class with the key being the system property + * defined above. + * + *

      + * The stax.properties file is read only once by the implementation + * and its values are then cached for future use. If the file does not exist + * when the first attempt is made to read from it, no further attempts are + * made to check for its existence. It is not possible to change the value + * of any property in stax.properties after it has been read for the first time. + * + *

      + * Use the jaxp configuration file "jaxp.properties". The file is in the same + * format as stax.properties and will only be read if stax.properties does + * not exist. *

      • *
    • - * Use the service-provider loading facilities, defined by the + *

      + * Use the service-provider loading facility, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an * implementation of the service using the {@linkplain * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: @@ -159,17 +174,17 @@ public abstract class XMLOutputFactory { * ClassLoader#getSystemClassLoader() system class loader} will be used. *

      • *
    • + *

      * Otherwise, the system-default implementation is returned. *

      • *

      * Once an application has obtained a reference to a XMLOutputFactory it * can use the factory to configure and obtain stream instances. - *

      *

      * Note that this is a new method that replaces the deprecated newInstance() method. * No changes in behavior are defined by this replacement method relative to the * deprecated method. - *

      + * * @throws FactoryConfigurationError in case of {@linkplain * java.util.ServiceConfigurationError service configuration error} or if * the implementation is not available or cannot be instantiated. @@ -207,20 +222,35 @@ public abstract class XMLOutputFactory { *

      * This method uses the following ordered lookup procedure to determine * the XMLOutputFactory implementation class to load: - *

      + *

      *

        *
      • * Use the value of the system property identified by {@code factoryId}. *
        • *
      • - * Use the properties file "lib/stax.properties" in the JRE directory. - * This configuration file is in standard java.util.Properties format - * and contains the fully qualified name of the implementation class - * with the key being the given {@code factoryId}. + *

        + * Use the configuration file "stax.properties". The file is in standard + * {@link java.util.Properties} format and typically located in the + * {@code conf} directory of the Java installation. It contains the fully qualified + * name of the implementation class with the key being the system property + * defined above. + * + *

        + * The stax.properties file is read only once by the implementation + * and its values are then cached for future use. If the file does not exist + * when the first attempt is made to read from it, no further attempts are + * made to check for its existence. It is not possible to change the value + * of any property in stax.properties after it has been read for the first time. + * + *

        + * Use the jaxp configuration file "jaxp.properties". The file is in the same + * format as stax.properties and will only be read if stax.properties does + * not exist. *

        • *
      • + *

        * If {@code factoryId} is "javax.xml.stream.XMLOutputFactory", - * use the service-provider loading facilities, defined by the + * use the service-provider loading facility, defined by the * {@link java.util.ServiceLoader} class, to attempt to {@linkplain * java.util.ServiceLoader#load(java.lang.Class, java.lang.ClassLoader) locate and load} * an implementation of the service using the specified {@code ClassLoader}. @@ -233,6 +263,7 @@ public abstract class XMLOutputFactory { * ClassLoader#getSystemClassLoader() system class loader} will be used. *

        • *
      • + *

        * Otherwise, throws a {@link FactoryConfigurationError}. *

        • *
      @@ -246,7 +277,7 @@ public abstract class XMLOutputFactory { * {@link #newInstance(java.lang.String, java.lang.ClassLoader) * newInstance(String factoryId, ClassLoader classLoader)} method. * The original method was incorrectly defined to return XMLInputFactory. - *

      + * * * @param factoryId Name of the factory to find, same as * a property name diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java index 846cda11048..2fd931df891 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ package javax.xml.transform; *

      The system property that determines which Factory implementation * to create is named "javax.xml.transform.TransformerFactory". * This property names a concrete subclass of the - * TransformerFactory abstract class. If the property is not + * {@code TransformerFactory} abstract class. If the property is not * defined, a platform default is be used.

      * * @author Jeff Suttor @@ -51,31 +51,36 @@ public abstract class TransformerFactory { /** - *

      Obtain a new instance of a TransformerFactory. - * This static method creates a new factory instance.

      - *

      This method uses the following ordered lookup procedure to determine - * the TransformerFactory implementation class to - * load:

      + *

      + * Obtain a new instance of a {@code TransformerFactory}. + * This static method creates a new factory instance. + *

      + * This method uses the following ordered lookup procedure to determine + * the {@code TransformerFactory} implementation class to + * load: + *

      *

        *
      • - * Use the javax.xml.transform.TransformerFactory system + * Use the {@code javax.xml.transform.TransformerFactory} system * property. *
        • *
      • - * Use the properties file "conf/jaxp.properties" in the JRE directory. - * This configuration file is in standard java.util.Properties - * format and contains the fully qualified name of the - * implementation class with the key being the system property defined - * above. - *
        + *

        + * Use the configuration file "jaxp.properties". The file is in standard + * {@link java.util.Properties} format and typically located in the + * {@code conf} directory of the Java installation. It contains the fully qualified + * name of the implementation class with the key being the system property + * defined above. + *

        * The jaxp.properties file is read only once by the JAXP implementation - * and it's values are then cached for future use. If the file does not exist + * and its values are then cached for future use. If the file does not exist * when the first attempt is made to read from it, no further attempts are * made to check for its existence. It is not possible to change the value * of any property in jaxp.properties after it has been read for the first time. *

        • *
      • - * Use the service-provider loading facilities, defined by the + *

        + * Use the service-provider loading facility, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an * implementation of the service using the {@linkplain * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: @@ -86,13 +91,15 @@ public abstract class TransformerFactory { * ClassLoader#getSystemClassLoader() system class loader} will be used. *

        • *
      • + *

        * Otherwise, the system-default implementation is returned. *

        • *
      * - *

      Once an application has obtained a reference to a - * TransformerFactory it can use the factory to configure - * and obtain transformer instances.

      + *

      + * Once an application has obtained a reference to a + * {@code TransformerFactory} it can use the factory to configure + * and obtain transformer instances. * * @return new TransformerFactory instance, never null. * @@ -111,13 +118,13 @@ public abstract class TransformerFactory { } /** - *

      Obtain a new instance of a TransformerFactory from factory class name. + *

      Obtain a new instance of a {@code TransformerFactory} from factory class name. * This function is useful when there are multiple providers in the classpath. * It gives more control to the application as it can specify which provider * should be loaded.

      * - *

      Once an application has obtained a reference to a - * TransformerFactory it can use the factory to configure + *

      Once an application has obtained a reference to a + * {@code TransformerFactory} it can use the factory to configure * and obtain transformer instances.

      * *

      Tip for Trouble-shooting

      @@ -130,7 +137,7 @@ public abstract class TransformerFactory { * java -Djaxp.debug=1 YourProgram .... * * - * @param factoryClassName fully qualified factory class name that provides implementation of javax.xml.transform.TransformerFactory. + * @param factoryClassName fully qualified factory class name that provides implementation of {@code javax.xml.transform.TransformerFactory}. * * @param classLoader ClassLoader used to load the factory class. If null * current Thread's context classLoader is used to load the factory class. @@ -232,7 +239,7 @@ public abstract class TransformerFactory { * @param charset The value of the charset attribute to match. May be null. * * @return A Source Object suitable for passing - * to the TransformerFactory. + * to the {@code TransformerFactory}. * * @throws TransformerConfigurationException An Exception * is thrown if an error occurings during parsing of the @@ -268,15 +275,15 @@ public abstract class TransformerFactory { //======= CONFIGURATION METHODS ======= /** - *

      Set a feature for this TransformerFactory and Transformers + *

      Set a feature for this {@code TransformerFactory} and Transformers * or Templates created by this factory.

      * *

      * Feature names are fully qualified {@link java.net.URI}s. * Implementations may define their own features. - * An {@link TransformerConfigurationException} is thrown if this TransformerFactory or the + * An {@link TransformerConfigurationException} is thrown if this {@code TransformerFactory} or the * Transformers or Templates it creates cannot support the feature. - * It is possible for an TransformerFactory to expose a feature value but be unable to change its state. + * It is possible for an {@code TransformerFactory} to expose a feature value but be unable to change its state. *

      * *

      All implementations are required to support the {@link javax.xml.XMLConstants#FEATURE_SECURE_PROCESSING} feature. @@ -299,7 +306,7 @@ public abstract class TransformerFactory { * @param name Feature name. * @param value Is feature state true or false. * - * @throws TransformerConfigurationException if this TransformerFactory + * @throws TransformerConfigurationException if this {@code TransformerFactory} * or the Transformers or Templates it creates cannot support this feature. * @throws NullPointerException If the name parameter is null. */ @@ -312,9 +319,9 @@ public abstract class TransformerFactory { *

      * Feature names are fully qualified {@link java.net.URI}s. * Implementations may define their own features. - * false is returned if this TransformerFactory or the + * false is returned if this {@code TransformerFactory} or the * Transformers or Templates it creates cannot support the feature. - * It is possible for an TransformerFactory to expose a feature value but be unable to change its state. + * It is possible for an {@code TransformerFactory} to expose a feature value but be unable to change its state. *

      * * @param name Feature name. diff --git a/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java index 527c6c73a02..ad7e61f9a7f 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -132,8 +132,9 @@ public abstract class SchemaFactory { * where "the class loader" refers to the context class loader:

      *
        *
      1. + *

        * If the system property - * "javax.xml.validation.SchemaFactory:schemaLanguage" + * {@code "javax.xml.validation.SchemaFactory:schemaLanguage"} * is present (where schemaLanguage is the parameter * to this method), then its value is read * as a class name. The method will try to @@ -141,12 +142,22 @@ public abstract class SchemaFactory { * and returns it if it is successfully created. *

        2. *
      2. - * $java.home/conf/jaxp.properties is read and - * the value associated with the key being the system property above - * is looked for. If present, the value is processed just like above. + *

        + * Use the configuration file "jaxp.properties". The file is in standard + * {@link java.util.Properties} format and typically located in the + * conf directory of the Java installation. It contains the fully qualified + * name of the implementation class with the key being the system property + * defined above. + *

        + * The jaxp.properties file is read only once by the JAXP implementation + * and its values are then cached for future use. If the file does not exist + * when the first attempt is made to read from it, no further attempts are + * made to check for its existence. It is not possible to change the value + * of any property in jaxp.properties after it has been read for the first time. *

        3. *
      3. - * Use the service-provider loading facilities, defined by the + *

        + * Use the service-provider loading facility, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an * implementation of the service using the {@linkplain * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: @@ -166,19 +177,20 @@ public abstract class SchemaFactory { * {@link SchemaFactoryConfigurationError} will be thrown. *

        4. *
      4. + *

        * Platform default SchemaFactory is located * in a implementation specific way. There must be a platform default * SchemaFactory for W3C XML Schema. *

        5. *
      * - *

      If everything fails, {@link IllegalArgumentException} will be thrown.

      + *

      If everything fails, {@link IllegalArgumentException} will be thrown. * - *

      Tip for Trouble-shooting:

      + *

      Tip for Trouble-shooting: *

      See {@link java.util.Properties#load(java.io.InputStream)} for * exactly how a property file is parsed. In particular, colons ':' * need to be escaped in a property file, so make sure schema language - * URIs are properly escaped in it. For example:

      + * URIs are properly escaped in it. For example: * 
            * http\://www.w3.org/2001/XMLSchema=org.acme.foo.XSSchemaFactory
      *
      diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java index ea7370e06e7..05f7a4e52c0 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ package javax.xml.xpath; /** - *

      An XPathFactory instance can be used to create + *

      An {@code XPathFactory} instance can be used to create * {@link javax.xml.xpath.XPath} objects.

      * *

      See {@link #newInstance(String uri)} for lookup mechanism.

      @@ -68,13 +68,13 @@ public abstract class XPathFactory { /** *

      Protected constructor as {@link #newInstance()} or {@link #newInstance(String uri)} * or {@link #newInstance(String uri, String factoryClassName, ClassLoader classLoader)} - * should be used to create a new instance of an XPathFactory.

      + * should be used to create a new instance of an {@code XPathFactory}.

      */ protected XPathFactory() { } /** - *

      Get a new XPathFactory instance using the default object model, + *

      Get a new {@code XPathFactory} instance using the default object model, * {@link #DEFAULT_OBJECT_MODEL_URI}, * the W3C DOM.

      * @@ -85,10 +85,10 @@ public abstract class XPathFactory { * *

      Since the implementation for the W3C DOM is always available, this method will never fail.

      * - * @return Instance of an XPathFactory. + * @return Instance of an {@code XPathFactory}. * * @throws RuntimeException When there is a failure in creating an - * XPathFactory for the default object model. + * {@code XPathFactory} for the default object model. */ public static XPathFactory newInstance() { @@ -105,23 +105,35 @@ public abstract class XPathFactory { } /** - *

      Get a new XPathFactory instance using the specified object model.

      + *

      Get a new {@code XPathFactory} instance using the specified object model.

      * - *

      To find a XPathFactory object, + *

      To find a {@code XPathFactory} object, * this method looks the following places in the following order where "the class loader" refers to the context class loader:

      *
        *
      1. + *

        * If the system property {@link #DEFAULT_PROPERTY_NAME} + ":uri" is present, * where uri is the parameter to this method, then its value is read as a class name. * The method will try to create a new instance of this class by using the class loader, * and returns it if it is successfully created. *

        2. *
      2. - * ${java.home}/lib/jaxp.properties is read and the value associated with the key being the system property above is looked for. - * If present, the value is processed just like above. + *

        + * Use the configuration file "jaxp.properties". The file is in standard + * {@link java.util.Properties} format and typically located in the + * conf directory of the Java installation. It contains the fully qualified + * name of the implementation class with the key being the system property + * defined above. + *

        + * The jaxp.properties file is read only once by the JAXP implementation + * and its values are then cached for future use. If the file does not exist + * when the first attempt is made to read from it, no further attempts are + * made to check for its existence. It is not possible to change the value + * of any property in jaxp.properties after it has been read for the first time. *

        3. *
      3. - * Use the service-provider loading facilities, defined by the + *

        + * Use the service-provider loading facility, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an * implementation of the service using the {@linkplain * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: @@ -140,16 +152,17 @@ public abstract class XPathFactory { * {@link XPathFactoryConfigurationException} will be thrown. *

        4. *
      4. - * Platform default XPathFactory is located in a platform specific way. + *

        + * Platform default {@code XPathFactory} is located in a platform specific way. * There must be a platform default XPathFactory for the W3C DOM, i.e. {@link #DEFAULT_OBJECT_MODEL_URI}. *

        5. *
      - *

      If everything fails, an XPathFactoryConfigurationException will be thrown.

      + *

      If everything fails, an {@code XPathFactoryConfigurationException} will be thrown. * - *

      Tip for Trouble-shooting:

      + *

      Tip for Trouble-shooting: *

      See {@link java.util.Properties#load(java.io.InputStream)} for exactly how a property file is parsed. * In particular, colons ':' need to be escaped in a property file, so make sure the URIs are properly escaped in it. - * For example:

      + * For example: * 
           *   http\://java.sun.com/jaxp/xpath/dom=org.acme.DomXPathFactory
     *
      @@ -159,7 +172,7 @@ public abstract class XPathFactory { * http://java.sun.com/jaxp/xpath/dom for the W3C DOM, * the org.w3c.dom package, and implementations are free to introduce other URIs for other object models. * - * @return Instance of an XPathFactory. + * @return Instance of an {@code XPathFactory}. * * @throws XPathFactoryConfigurationException If the specified object model * is unavailable, or if there is a configuration error. @@ -199,7 +212,7 @@ public abstract class XPathFactory { } /** - *

      Obtain a new instance of a XPathFactory from a factory class name. XPathFactory + *

      Obtain a new instance of a {@code XPathFactory} from a factory class name. {@code XPathFactory} * is returned if specified factory class supports the specified object model. * This function is useful when there are multiple providers in the classpath. * It gives more control to the application as it can specify which provider @@ -227,7 +240,7 @@ public abstract class XPathFactory { * current Thread's context classLoader is used to load the factory class. * * - * @return New instance of a XPathFactory + * @return New instance of a {@code XPathFactory} * * @throws XPathFactoryConfigurationException * if factoryClassName is null, or @@ -281,11 +294,11 @@ public abstract class XPathFactory { } /** - *

      Is specified object model supported by this XPathFactory?

      + *

      Is specified object model supported by this {@code XPathFactory}?

      * - * @param objectModel Specifies the object model which the returned XPathFactory will understand. + * @param objectModel Specifies the object model which the returned {@code XPathFactory} will understand. * - * @return true if XPathFactory supports objectModel, else false. + * @return true if {@code XPathFactory} supports objectModel, else false. * * @throws NullPointerException If objectModel is null. * @throws IllegalArgumentException If objectModel.length() == 0. @@ -293,16 +306,16 @@ public abstract class XPathFactory { public abstract boolean isObjectModelSupported(String objectModel); /** - *

      Set a feature for this XPathFactory and + *

      Set a feature for this {@code XPathFactory} and * XPaths created by this factory.

      * *

      * Feature names are fully qualified {@link java.net.URI}s. * Implementations may define their own features. * An {@link XPathFactoryConfigurationException} is thrown if this - * XPathFactory or the XPaths + * {@code XPathFactory} or the XPaths * it creates cannot support the feature. - * It is possible for an XPathFactory to expose a feature value + * It is possible for an {@code XPathFactory} to expose a feature value * but be unable to change its state. *

      * @@ -316,7 +329,7 @@ public abstract class XPathFactory { * @param name Feature name. * @param value Is feature state true or false. * - * @throws XPathFactoryConfigurationException if this XPathFactory or the XPaths + * @throws XPathFactoryConfigurationException if this {@code XPathFactory} or the XPaths * it creates cannot support this feature. * @throws NullPointerException if name is null. */ @@ -330,9 +343,9 @@ public abstract class XPathFactory { * Feature names are fully qualified {@link java.net.URI}s. * Implementations may define their own features. * An {@link XPathFactoryConfigurationException} is thrown if this - * XPathFactory or the XPaths + * {@code XPathFactory} or the XPaths * it creates cannot support the feature. - * It is possible for an XPathFactory to expose a feature value + * It is possible for an {@code XPathFactory} to expose a feature value * but be unable to change its state. *

      * @@ -341,7 +354,7 @@ public abstract class XPathFactory { * @return State of the named feature. * * @throws XPathFactoryConfigurationException if this - * XPathFactory or the XPaths + * {@code XPathFactory} or the XPaths * it creates cannot support this feature. * @throws NullPointerException if name is null. */ @@ -382,7 +395,7 @@ public abstract class XPathFactory { /** *

      Return a new XPath using the underlying object - * model determined when the XPathFactory was instantiated.

      + * model determined when the {@code XPathFactory} was instantiated.

      * * @return New instance of an XPath. */ From 2972cb3840d1f0d24e71f22bd667ef11ca8a5482 Mon Sep 17 00:00:00 2001 From: Attila Szegedi Date: Fri, 6 Mar 2015 09:59:07 +0100 Subject: [PATCH 63/97] 8074491: run-nasgen in ant doesn't see the right Nashorn classes Reviewed-by: hannesw, lagergren --- nashorn/make/build-nasgen.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nashorn/make/build-nasgen.xml b/nashorn/make/build-nasgen.xml index d98333719bd..003201199f4 100644 --- a/nashorn/make/build-nasgen.xml +++ b/nashorn/make/build-nasgen.xml @@ -35,11 +35,10 @@ - - + @@ -52,8 +51,8 @@ - + From e776a10ce338c2031f531192725b62bc3cf109a7 Mon Sep 17 00:00:00 2001 From: Attila Szegedi Date: Fri, 6 Mar 2015 10:18:47 +0100 Subject: [PATCH 64/97] 8074487: Static analysis of IfNode should consider terminating branches Reviewed-by: hannesw, lagergren --- .../codegen/LocalVariableTypesCalculator.java | 78 ++++++++++--------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java index 379d3aca20e..67adc4aca21 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java @@ -206,7 +206,6 @@ final class LocalVariableTypesCalculator extends NodeVisitor{ // continuations (since RewriteException's byteCodeSlots carries an array and not a name-value map). symbolIsConverted(symbol, branchLvarType, targetType); - //symbolIsUsed(symbol, branchLvarType); return new LocalVariableConversion(symbol, branchLvarType.type, targetType.type, next); } @@ -229,7 +228,7 @@ final class LocalVariableTypesCalculator extends NodeVisitor{ for(final Symbol symbol: commonSymbols) { final LvarType type1 = types1.get(symbol); final LvarType type2 = types2.get(symbol); - final LvarType widest = widestLvarType(type1, type2); + final LvarType widest = widestLvarType(type1, type2); if(widest != type1 && matches1) { matches1 = false; if(!matches2) { @@ -242,7 +241,7 @@ final class LocalVariableTypesCalculator extends NodeVisitor{ union = cloneMap(types2); } } - if(!(matches1 || matches2) && union != null) { //remove overly enthusiastic "union can be null" warning + if(!(matches1 || matches2)) { assert union != null; union.put(symbol, widest); } @@ -711,8 +710,13 @@ final class LocalVariableTypesCalculator extends NodeVisitor{ @Override public boolean enterIfNode(final IfNode ifNode) { + processIfNode(ifNode); + return false; + } + + private void processIfNode(final IfNode ifNode) { if(!reachable) { - return false; + return; } final Expression test = ifNode.getTest(); @@ -721,48 +725,48 @@ final class LocalVariableTypesCalculator extends NodeVisitor{ visitExpressionOnEmptyStack(test); - final Map afterTestLvarTypes = localVariableTypes; - if(!isAlwaysFalse(test)) { + final Map passLvarTypes; + final boolean reachableFromPass; + final boolean isTestAlwaysTrue = isAlwaysTrue(test); + if(isAlwaysFalse(test)) { + passLvarTypes = null; + reachableFromPass = false; + } else { + final Map afterTestLvarTypes = localVariableTypes; pass.accept(this); assertTypeStackIsEmpty(); + if (isTestAlwaysTrue) { + return; + } + passLvarTypes = localVariableTypes; + reachableFromPass = reachable; + localVariableTypes = afterTestLvarTypes; + reachable = true; } - final Map passLvarTypes = localVariableTypes; - final boolean reachableFromPass = reachable; - reachable = true; - localVariableTypes = afterTestLvarTypes; - if(!isAlwaysTrue(test) && fail != null) { + // If we get here, then we need to consider the case where pass block is not executed + assert !isTestAlwaysTrue; + + if (fail != null) { fail.accept(this); assertTypeStackIsEmpty(); - final boolean reachableFromFail = reachable; - reachable |= reachableFromPass; - if(!reachable) { - return false; - } - - if(reachableFromFail) { - if(reachableFromPass) { - final Map failLvarTypes = localVariableTypes; - localVariableTypes = getUnionTypes(passLvarTypes, failLvarTypes); - setConversion(pass, passLvarTypes, localVariableTypes); - setConversion(fail, failLvarTypes, localVariableTypes); - } - return false; - } } - if(reachableFromPass) { - localVariableTypes = getUnionTypes(afterTestLvarTypes, passLvarTypes); - // IfNode itself is associated with conversions that might need to be performed after the test if there's no - // else branch. E.g. - // if(x = 1, cond) { x = 1.0 } must widen "x = 1" to a double. - setConversion(pass, passLvarTypes, localVariableTypes); - setConversion(ifNode, afterTestLvarTypes, localVariableTypes); - } else { - localVariableTypes = afterTestLvarTypes; + if(reachable) { + if(reachableFromPass) { + final Map failLvarTypes = localVariableTypes; + localVariableTypes = getUnionTypes(passLvarTypes, failLvarTypes); + setConversion(pass, passLvarTypes, localVariableTypes); + // IfNode itself is associated with conversions that might need to be performed after the test if + // there's no else branch. E.g. + // if(x = 1, cond) { x = 1.0 } must widen "x = 1" to a double. + setConversion(fail != null ? fail : ifNode, failLvarTypes, localVariableTypes); + } + } else if (reachableFromPass) { + assert passLvarTypes != null; + localVariableTypes = passLvarTypes; + reachable = true; } - - return false; } @Override From a98187119402a1c60482128abdefe72e370d869e Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Fri, 6 Mar 2015 10:30:44 +0000 Subject: [PATCH 65/97] 8074306: NULLCHK is emitted as Object.getClass 8074501: Javac fix for 8073432 is missing right test BugIDs Correct test bugIds Reviewed-by: jjg --- langtools/test/tools/javac/8074306/TestSyntheticNullChecks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/langtools/test/tools/javac/8074306/TestSyntheticNullChecks.java b/langtools/test/tools/javac/8074306/TestSyntheticNullChecks.java index 539dd419b71..823740f0d3b 100644 --- a/langtools/test/tools/javac/8074306/TestSyntheticNullChecks.java +++ b/langtools/test/tools/javac/8074306/TestSyntheticNullChecks.java @@ -25,7 +25,7 @@ /* * @test - * @bug 8074306 + * @bug 8074306 8073432 8074501 * @summary NULLCHK is emitted as Object.getClass * @compile -source 6 -target 6 TestSyntheticNullChecks.java * @run main TestSyntheticNullChecks 6 From e1ac257862a7b48fac62b2c7d444179a9cda2445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= Date: Fri, 6 Mar 2015 15:26:51 +0100 Subject: [PATCH 66/97] 8074545: Undefined object values in object literals with spill properties Reviewed-by: lagergren, attila --- .../nashorn/internal/codegen/MapCreator.java | 5 +- .../nashorn/internal/parser/JSONParser.java | 9 +- .../internal/runtime/SpillProperty.java | 9 +- nashorn/test/script/basic/JDK-8074545.js | 1038 +++++++++++++++++ 4 files changed, 1051 insertions(+), 10 deletions(-) create mode 100644 nashorn/test/script/basic/JDK-8074545.js diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapCreator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapCreator.java index 1bec86fcf05..ae96dc46607 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapCreator.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapCreator.java @@ -100,15 +100,16 @@ public class MapCreator { for (final MapTuple tuple : tuples) { final String key = tuple.key; final Symbol symbol = tuple.symbol; + final Class initialType = tuple.getValueType(); - //TODO initial type is object here no matter what. Is that right? if (symbol != null && !isValidArrayIndex(getArrayIndex(key))) { final int flags = getPropertyFlags(symbol, hasArguments, false); properties.add( new SpillProperty( key, flags, - spillIndex++)); + spillIndex++, + initialType)); } } diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/JSONParser.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/JSONParser.java index f1f46ea6fad..524381873fb 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/JSONParser.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/JSONParser.java @@ -244,20 +244,15 @@ public class JSONParser { private static PropertyMap addObjectProperty(final PropertyMap propertyMap, final List values, final String id, final Object value) { final Property oldProperty = propertyMap.findProperty(id); - final Property newProperty; final PropertyMap newMap; final Class type = ObjectClassGenerator.OBJECT_FIELDS_ONLY ? Object.class : getType(value); if (oldProperty != null) { values.set(oldProperty.getSlot(), value); - newProperty = new SpillProperty(id, 0, oldProperty.getSlot()); - newProperty.setType(type); - newMap = propertyMap.replaceProperty(oldProperty, newProperty);; + newMap = propertyMap.replaceProperty(oldProperty, new SpillProperty(id, 0, oldProperty.getSlot(), type));; } else { values.add(value); - newProperty = new SpillProperty(id, 0, propertyMap.size()); - newProperty.setType(type); - newMap = propertyMap.addProperty(newProperty); + newMap = propertyMap.addProperty(new SpillProperty(id, 0, propertyMap.size(), type)); } return newMap; diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java index 7b42b2bfa30..856504a3b0d 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java @@ -164,7 +164,14 @@ public class SpillProperty extends AccessorProperty { assert !OBJECT_FIELDS_ONLY || getLocalType() == Object.class; } - SpillProperty(final String key, final int flags, final int slot, final Class initialType) { + /** + * Constructor for spill properties with an initial type. + * @param key the property key + * @param flags the property flags + * @param slot spill slot + * @param initialType initial type + */ + public SpillProperty(final String key, final int flags, final int slot, final Class initialType) { this(key, flags, slot); setType(OBJECT_FIELDS_ONLY ? Object.class : initialType); } diff --git a/nashorn/test/script/basic/JDK-8074545.js b/nashorn/test/script/basic/JDK-8074545.js new file mode 100644 index 00000000000..e2ea38cddf0 --- /dev/null +++ b/nashorn/test/script/basic/JDK-8074545.js @@ -0,0 +1,1038 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * JDK-8074545: Undefined object values in object literals with spill properties + * + * @test + * @run + */ + +var obj = { + "p0": { "x" : 0 }, + "p1": { "x" : 1 }, + "p2": { "x" : 2 }, + "p3": { "x" : 3 }, + "p4": { "x" : 4 }, + "p5": { "x" : 5 }, + "p6": { "x" : 6 }, + "p7": { "x" : 7 }, + "p8": { "x" : 8 }, + "p9": { "x" : 9 }, + "p10": { "x" : 10 }, + "p11": { "x" : 11 }, + "p12": { "x" : 12 }, + "p13": { "x" : 13 }, + "p14": { "x" : 14 }, + "p15": { "x" : 15 }, + "p16": { "x" : 16 }, + "p17": { "x" : 17 }, + "p18": { "x" : 18 }, + "p19": { "x" : 19 }, + "p20": { "x" : 20 }, + "p21": { "x" : 21 }, + "p22": { "x" : 22 }, + "p23": { "x" : 23 }, + "p24": { "x" : 24 }, + "p25": { "x" : 25 }, + "p26": { "x" : 26 }, + "p27": { "x" : 27 }, + "p28": { "x" : 28 }, + "p29": { "x" : 29 }, + "p30": { "x" : 30 }, + "p31": { "x" : 31 }, + "p32": { "x" : 32 }, + "p33": { "x" : 33 }, + "p34": { "x" : 34 }, + "p35": { "x" : 35 }, + "p36": { "x" : 36 }, + "p37": { "x" : 37 }, + "p38": { "x" : 38 }, + "p39": { "x" : 39 }, + "p40": { "x" : 40 }, + "p41": { "x" : 41 }, + "p42": { "x" : 42 }, + "p43": { "x" : 43 }, + "p44": { "x" : 44 }, + "p45": { "x" : 45 }, + "p46": { "x" : 46 }, + "p47": { "x" : 47 }, + "p48": { "x" : 48 }, + "p49": { "x" : 49 }, + "p50": { "x" : 50 }, + "p51": { "x" : 51 }, + "p52": { "x" : 52 }, + "p53": { "x" : 53 }, + "p54": { "x" : 54 }, + "p55": { "x" : 55 }, + "p56": { "x" : 56 }, + "p57": { "x" : 57 }, + "p58": { "x" : 58 }, + "p59": { "x" : 59 }, + "p60": { "x" : 60 }, + "p61": { "x" : 61 }, + "p62": { "x" : 62 }, + "p63": { "x" : 63 }, + "p64": { "x" : 64 }, + "p65": { "x" : 65 }, + "p66": { "x" : 66 }, + "p67": { "x" : 67 }, + "p68": { "x" : 68 }, + "p69": { "x" : 69 }, + "p70": { "x" : 70 }, + "p71": { "x" : 71 }, + "p72": { "x" : 72 }, + "p73": { "x" : 73 }, + "p74": { "x" : 74 }, + "p75": { "x" : 75 }, + "p76": { "x" : 76 }, + "p77": { "x" : 77 }, + "p78": { "x" : 78 }, + "p79": { "x" : 79 }, + "p80": { "x" : 80 }, + "p81": { "x" : 81 }, + "p82": { "x" : 82 }, + "p83": { "x" : 83 }, + "p84": { "x" : 84 }, + "p85": { "x" : 85 }, + "p86": { "x" : 86 }, + "p87": { "x" : 87 }, + "p88": { "x" : 88 }, + "p89": { "x" : 89 }, + "p90": { "x" : 90 }, + "p91": { "x" : 91 }, + "p92": { "x" : 92 }, + "p93": { "x" : 93 }, + "p94": { "x" : 94 }, + "p95": { "x" : 95 }, + "p96": { "x" : 96 }, + "p97": { "x" : 97 }, + "p98": { "x" : 98 }, + "p99": { "x" : 99 }, + "p100": { "x" : 100 }, + "p101": { "x" : 101 }, + "p102": { "x" : 102 }, + "p103": { "x" : 103 }, + "p104": { "x" : 104 }, + "p105": { "x" : 105 }, + "p106": { "x" : 106 }, + "p107": { "x" : 107 }, + "p108": { "x" : 108 }, + "p109": { "x" : 109 }, + "p110": { "x" : 110 }, + "p111": { "x" : 111 }, + "p112": { "x" : 112 }, + "p113": { "x" : 113 }, + "p114": { "x" : 114 }, + "p115": { "x" : 115 }, + "p116": { "x" : 116 }, + "p117": { "x" : 117 }, + "p118": { "x" : 118 }, + "p119": { "x" : 119 }, + "p120": { "x" : 120 }, + "p121": { "x" : 121 }, + "p122": { "x" : 122 }, + "p123": { "x" : 123 }, + "p124": { "x" : 124 }, + "p125": { "x" : 125 }, + "p126": { "x" : 126 }, + "p127": { "x" : 127 }, + "p128": { "x" : 128 }, + "p129": { "x" : 129 }, + "p130": { "x" : 130 }, + "p131": { "x" : 131 }, + "p132": { "x" : 132 }, + "p133": { "x" : 133 }, + "p134": { "x" : 134 }, + "p135": { "x" : 135 }, + "p136": { "x" : 136 }, + "p137": { "x" : 137 }, + "p138": { "x" : 138 }, + "p139": { "x" : 139 }, + "p140": { "x" : 140 }, + "p141": { "x" : 141 }, + "p142": { "x" : 142 }, + "p143": { "x" : 143 }, + "p144": { "x" : 144 }, + "p145": { "x" : 145 }, + "p146": { "x" : 146 }, + "p147": { "x" : 147 }, + "p148": { "x" : 148 }, + "p149": { "x" : 149 }, + "p150": { "x" : 150 }, + "p151": { "x" : 151 }, + "p152": { "x" : 152 }, + "p153": { "x" : 153 }, + "p154": { "x" : 154 }, + "p155": { "x" : 155 }, + "p156": { "x" : 156 }, + "p157": { "x" : 157 }, + "p158": { "x" : 158 }, + "p159": { "x" : 159 }, + "p160": { "x" : 160 }, + "p161": { "x" : 161 }, + "p162": { "x" : 162 }, + "p163": { "x" : 163 }, + "p164": { "x" : 164 }, + "p165": { "x" : 165 }, + "p166": { "x" : 166 }, + "p167": { "x" : 167 }, + "p168": { "x" : 168 }, + "p169": { "x" : 169 }, + "p170": { "x" : 170 }, + "p171": { "x" : 171 }, + "p172": { "x" : 172 }, + "p173": { "x" : 173 }, + "p174": { "x" : 174 }, + "p175": { "x" : 175 }, + "p176": { "x" : 176 }, + "p177": { "x" : 177 }, + "p178": { "x" : 178 }, + "p179": { "x" : 179 }, + "p180": { "x" : 180 }, + "p181": { "x" : 181 }, + "p182": { "x" : 182 }, + "p183": { "x" : 183 }, + "p184": { "x" : 184 }, + "p185": { "x" : 185 }, + "p186": { "x" : 186 }, + "p187": { "x" : 187 }, + "p188": { "x" : 188 }, + "p189": { "x" : 189 }, + "p190": { "x" : 190 }, + "p191": { "x" : 191 }, + "p192": { "x" : 192 }, + "p193": { "x" : 193 }, + "p194": { "x" : 194 }, + "p195": { "x" : 195 }, + "p196": { "x" : 196 }, + "p197": { "x" : 197 }, + "p198": { "x" : 198 }, + "p199": { "x" : 199 }, + "p200": { "x" : 200 }, + "p201": { "x" : 201 }, + "p202": { "x" : 202 }, + "p203": { "x" : 203 }, + "p204": { "x" : 204 }, + "p205": { "x" : 205 }, + "p206": { "x" : 206 }, + "p207": { "x" : 207 }, + "p208": { "x" : 208 }, + "p209": { "x" : 209 }, + "p210": { "x" : 210 }, + "p211": { "x" : 211 }, + "p212": { "x" : 212 }, + "p213": { "x" : 213 }, + "p214": { "x" : 214 }, + "p215": { "x" : 215 }, + "p216": { "x" : 216 }, + "p217": { "x" : 217 }, + "p218": { "x" : 218 }, + "p219": { "x" : 219 }, + "p220": { "x" : 220 }, + "p221": { "x" : 221 }, + "p222": { "x" : 222 }, + "p223": { "x" : 223 }, + "p224": { "x" : 224 }, + "p225": { "x" : 225 }, + "p226": { "x" : 226 }, + "p227": { "x" : 227 }, + "p228": { "x" : 228 }, + "p229": { "x" : 229 }, + "p230": { "x" : 230 }, + "p231": { "x" : 231 }, + "p232": { "x" : 232 }, + "p233": { "x" : 233 }, + "p234": { "x" : 234 }, + "p235": { "x" : 235 }, + "p236": { "x" : 236 }, + "p237": { "x" : 237 }, + "p238": { "x" : 238 }, + "p239": { "x" : 239 }, + "p240": { "x" : 240 }, + "p241": { "x" : 241 }, + "p242": { "x" : 242 }, + "p243": { "x" : 243 }, + "p244": { "x" : 244 }, + "p245": { "x" : 245 }, + "p246": { "x" : 246 }, + "p247": { "x" : 247 }, + "p248": { "x" : 248 }, + "p249": { "x" : 249 }, + "p250": { "x" : 250 }, + "p251": { "x" : 251 }, + "p252": { "x" : 252 }, + "p253": { "x" : 253 }, + "p254": { "x" : 254 }, + "p255": { "x" : 255 }, + "p256": { "x" : 256 }, + "p257": { "x" : 257 }, + "p258": { "x" : 258 }, + "p259": { "x" : 259 }, + "p260": { "x" : 260 }, + "p261": { "x" : 261 }, + "p262": { "x" : 262 }, + "p263": { "x" : 263 }, + "p264": { "x" : 264 }, + "p265": { "x" : 265 }, + "p266": { "x" : 266 }, + "p267": { "x" : 267 }, + "p268": { "x" : 268 }, + "p269": { "x" : 269 }, + "p270": { "x" : 270 }, + "p271": { "x" : 271 }, + "p272": { "x" : 272 }, + "p273": { "x" : 273 }, + "p274": { "x" : 274 }, + "p275": { "x" : 275 }, + "p276": { "x" : 276 }, + "p277": { "x" : 277 }, + "p278": { "x" : 278 }, + "p279": { "x" : 279 }, + "p280": { "x" : 280 }, + "p281": { "x" : 281 }, + "p282": { "x" : 282 }, + "p283": { "x" : 283 }, + "p284": { "x" : 284 }, + "p285": { "x" : 285 }, + "p286": { "x" : 286 }, + "p287": { "x" : 287 }, + "p288": { "x" : 288 }, + "p289": { "x" : 289 }, + "p290": { "x" : 290 }, + "p291": { "x" : 291 }, + "p292": { "x" : 292 }, + "p293": { "x" : 293 }, + "p294": { "x" : 294 }, + "p295": { "x" : 295 }, + "p296": { "x" : 296 }, + "p297": { "x" : 297 }, + "p298": { "x" : 298 }, + "p299": { "x" : 299 }, + "p300": { "x" : 300 }, + "p301": { "x" : 301 }, + "p302": { "x" : 302 }, + "p303": { "x" : 303 }, + "p304": { "x" : 304 }, + "p305": { "x" : 305 }, + "p306": { "x" : 306 }, + "p307": { "x" : 307 }, + "p308": { "x" : 308 }, + "p309": { "x" : 309 }, + "p310": { "x" : 310 }, + "p311": { "x" : 311 }, + "p312": { "x" : 312 }, + "p313": { "x" : 313 }, + "p314": { "x" : 314 }, + "p315": { "x" : 315 }, + "p316": { "x" : 316 }, + "p317": { "x" : 317 }, + "p318": { "x" : 318 }, + "p319": { "x" : 319 }, + "p320": { "x" : 320 }, + "p321": { "x" : 321 }, + "p322": { "x" : 322 }, + "p323": { "x" : 323 }, + "p324": { "x" : 324 }, + "p325": { "x" : 325 }, + "p326": { "x" : 326 }, + "p327": { "x" : 327 }, + "p328": { "x" : 328 }, + "p329": { "x" : 329 }, + "p330": { "x" : 330 }, + "p331": { "x" : 331 }, + "p332": { "x" : 332 }, + "p333": { "x" : 333 }, + "p334": { "x" : 334 }, + "p335": { "x" : 335 }, + "p336": { "x" : 336 }, + "p337": { "x" : 337 }, + "p338": { "x" : 338 }, + "p339": { "x" : 339 }, + "p340": { "x" : 340 }, + "p341": { "x" : 341 }, + "p342": { "x" : 342 }, + "p343": { "x" : 343 }, + "p344": { "x" : 344 }, + "p345": { "x" : 345 }, + "p346": { "x" : 346 }, + "p347": { "x" : 347 }, + "p348": { "x" : 348 }, + "p349": { "x" : 349 }, + "p350": { "x" : 350 }, + "p351": { "x" : 351 }, + "p352": { "x" : 352 }, + "p353": { "x" : 353 }, + "p354": { "x" : 354 }, + "p355": { "x" : 355 }, + "p356": { "x" : 356 }, + "p357": { "x" : 357 }, + "p358": { "x" : 358 }, + "p359": { "x" : 359 }, + "p360": { "x" : 360 }, + "p361": { "x" : 361 }, + "p362": { "x" : 362 }, + "p363": { "x" : 363 }, + "p364": { "x" : 364 }, + "p365": { "x" : 365 }, + "p366": { "x" : 366 }, + "p367": { "x" : 367 }, + "p368": { "x" : 368 }, + "p369": { "x" : 369 }, + "p370": { "x" : 370 }, + "p371": { "x" : 371 }, + "p372": { "x" : 372 }, + "p373": { "x" : 373 }, + "p374": { "x" : 374 }, + "p375": { "x" : 375 }, + "p376": { "x" : 376 }, + "p377": { "x" : 377 }, + "p378": { "x" : 378 }, + "p379": { "x" : 379 }, + "p380": { "x" : 380 }, + "p381": { "x" : 381 }, + "p382": { "x" : 382 }, + "p383": { "x" : 383 }, + "p384": { "x" : 384 }, + "p385": { "x" : 385 }, + "p386": { "x" : 386 }, + "p387": { "x" : 387 }, + "p388": { "x" : 388 }, + "p389": { "x" : 389 }, + "p390": { "x" : 390 }, + "p391": { "x" : 391 }, + "p392": { "x" : 392 }, + "p393": { "x" : 393 }, + "p394": { "x" : 394 }, + "p395": { "x" : 395 }, + "p396": { "x" : 396 }, + "p397": { "x" : 397 }, + "p398": { "x" : 398 }, + "p399": { "x" : 399 }, + "p400": { "x" : 400 }, + "p401": { "x" : 401 }, + "p402": { "x" : 402 }, + "p403": { "x" : 403 }, + "p404": { "x" : 404 }, + "p405": { "x" : 405 }, + "p406": { "x" : 406 }, + "p407": { "x" : 407 }, + "p408": { "x" : 408 }, + "p409": { "x" : 409 }, + "p410": { "x" : 410 }, + "p411": { "x" : 411 }, + "p412": { "x" : 412 }, + "p413": { "x" : 413 }, + "p414": { "x" : 414 }, + "p415": { "x" : 415 }, + "p416": { "x" : 416 }, + "p417": { "x" : 417 }, + "p418": { "x" : 418 }, + "p419": { "x" : 419 }, + "p420": { "x" : 420 }, + "p421": { "x" : 421 }, + "p422": { "x" : 422 }, + "p423": { "x" : 423 }, + "p424": { "x" : 424 }, + "p425": { "x" : 425 }, + "p426": { "x" : 426 }, + "p427": { "x" : 427 }, + "p428": { "x" : 428 }, + "p429": { "x" : 429 }, + "p430": { "x" : 430 }, + "p431": { "x" : 431 }, + "p432": { "x" : 432 }, + "p433": { "x" : 433 }, + "p434": { "x" : 434 }, + "p435": { "x" : 435 }, + "p436": { "x" : 436 }, + "p437": { "x" : 437 }, + "p438": { "x" : 438 }, + "p439": { "x" : 439 }, + "p440": { "x" : 440 }, + "p441": { "x" : 441 }, + "p442": { "x" : 442 }, + "p443": { "x" : 443 }, + "p444": { "x" : 444 }, + "p445": { "x" : 445 }, + "p446": { "x" : 446 }, + "p447": { "x" : 447 }, + "p448": { "x" : 448 }, + "p449": { "x" : 449 }, + "p450": { "x" : 450 }, + "p451": { "x" : 451 }, + "p452": { "x" : 452 }, + "p453": { "x" : 453 }, + "p454": { "x" : 454 }, + "p455": { "x" : 455 }, + "p456": { "x" : 456 }, + "p457": { "x" : 457 }, + "p458": { "x" : 458 }, + "p459": { "x" : 459 }, + "p460": { "x" : 460 }, + "p461": { "x" : 461 }, + "p462": { "x" : 462 }, + "p463": { "x" : 463 }, + "p464": { "x" : 464 }, + "p465": { "x" : 465 }, + "p466": { "x" : 466 }, + "p467": { "x" : 467 }, + "p468": { "x" : 468 }, + "p469": { "x" : 469 }, + "p470": { "x" : 470 }, + "p471": { "x" : 471 }, + "p472": { "x" : 472 }, + "p473": { "x" : 473 }, + "p474": { "x" : 474 }, + "p475": { "x" : 475 }, + "p476": { "x" : 476 }, + "p477": { "x" : 477 }, + "p478": { "x" : 478 }, + "p479": { "x" : 479 }, + "p480": { "x" : 480 }, + "p481": { "x" : 481 }, + "p482": { "x" : 482 }, + "p483": { "x" : 483 }, + "p484": { "x" : 484 }, + "p485": { "x" : 485 }, + "p486": { "x" : 486 }, + "p487": { "x" : 487 }, + "p488": { "x" : 488 }, + "p489": { "x" : 489 }, + "p490": { "x" : 490 }, + "p491": { "x" : 491 }, + "p492": { "x" : 492 }, + "p493": { "x" : 493 }, + "p494": { "x" : 494 }, + "p495": { "x" : 495 }, + "p496": { "x" : 496 }, + "p497": { "x" : 497 }, + "p498": { "x" : 498 }, + "p499": { "x" : 499 }, + "p500": { "x" : 500 }, + "p501": { "x" : 501 }, + "p502": { "x" : 502 }, + "p503": { "x" : 503 }, + "p504": { "x" : 504 }, + "p505": { "x" : 505 }, + "p506": { "x" : 506 }, + "p507": { "x" : 507 }, + "p508": { "x" : 508 }, + "p509": { "x" : 509 }, + "p510": { "x" : 510 }, + "p511": { "x" : 511 }, + "p512": { "x" : 512 }, + "p513": { "x" : 513 }, + "p514": { "x" : 514 }, + "p515": { "x" : 515 }, + "p516": { "x" : 516 }, + "p517": { "x" : 517 }, + "p518": { "x" : 518 }, + "p519": { "x" : 519 }, + "p520": { "x" : 520 }, + "p521": { "x" : 521 }, + "p522": { "x" : 522 }, + "p523": { "x" : 523 }, + "p524": { "x" : 524 }, + "p525": { "x" : 525 }, + "p526": { "x" : 526 }, + "p527": { "x" : 527 }, + "p528": { "x" : 528 }, + "p529": { "x" : 529 }, + "p530": { "x" : 530 }, + "p531": { "x" : 531 }, + "p532": { "x" : 532 }, + "p533": { "x" : 533 }, + "p534": { "x" : 534 }, + "p535": { "x" : 535 }, + "p536": { "x" : 536 }, + "p537": { "x" : 537 }, + "p538": { "x" : 538 }, + "p539": { "x" : 539 }, + "p540": { "x" : 540 }, + "p541": { "x" : 541 }, + "p542": { "x" : 542 }, + "p543": { "x" : 543 }, + "p544": { "x" : 544 }, + "p545": { "x" : 545 }, + "p546": { "x" : 546 }, + "p547": { "x" : 547 }, + "p548": { "x" : 548 }, + "p549": { "x" : 549 }, + "p550": { "x" : 550 }, + "p551": { "x" : 551 }, + "p552": { "x" : 552 }, + "p553": { "x" : 553 }, + "p554": { "x" : 554 }, + "p555": { "x" : 555 }, + "p556": { "x" : 556 }, + "p557": { "x" : 557 }, + "p558": { "x" : 558 }, + "p559": { "x" : 559 }, + "p560": { "x" : 560 }, + "p561": { "x" : 561 }, + "p562": { "x" : 562 }, + "p563": { "x" : 563 }, + "p564": { "x" : 564 }, + "p565": { "x" : 565 }, + "p566": { "x" : 566 }, + "p567": { "x" : 567 }, + "p568": { "x" : 568 }, + "p569": { "x" : 569 }, + "p570": { "x" : 570 }, + "p571": { "x" : 571 }, + "p572": { "x" : 572 }, + "p573": { "x" : 573 }, + "p574": { "x" : 574 }, + "p575": { "x" : 575 }, + "p576": { "x" : 576 }, + "p577": { "x" : 577 }, + "p578": { "x" : 578 }, + "p579": { "x" : 579 }, + "p580": { "x" : 580 }, + "p581": { "x" : 581 }, + "p582": { "x" : 582 }, + "p583": { "x" : 583 }, + "p584": { "x" : 584 }, + "p585": { "x" : 585 }, + "p586": { "x" : 586 }, + "p587": { "x" : 587 }, + "p588": { "x" : 588 }, + "p589": { "x" : 589 }, + "p590": { "x" : 590 }, + "p591": { "x" : 591 }, + "p592": { "x" : 592 }, + "p593": { "x" : 593 }, + "p594": { "x" : 594 }, + "p595": { "x" : 595 }, + "p596": { "x" : 596 }, + "p597": { "x" : 597 }, + "p598": { "x" : 598 }, + "p599": { "x" : 599 }, + "p600": { "x" : 600 }, + "p601": { "x" : 601 }, + "p602": { "x" : 602 }, + "p603": { "x" : 603 }, + "p604": { "x" : 604 }, + "p605": { "x" : 605 }, + "p606": { "x" : 606 }, + "p607": { "x" : 607 }, + "p608": { "x" : 608 }, + "p609": { "x" : 609 }, + "p610": { "x" : 610 }, + "p611": { "x" : 611 }, + "p612": { "x" : 612 }, + "p613": { "x" : 613 }, + "p614": { "x" : 614 }, + "p615": { "x" : 615 }, + "p616": { "x" : 616 }, + "p617": { "x" : 617 }, + "p618": { "x" : 618 }, + "p619": { "x" : 619 }, + "p620": { "x" : 620 }, + "p621": { "x" : 621 }, + "p622": { "x" : 622 }, + "p623": { "x" : 623 }, + "p624": { "x" : 624 }, + "p625": { "x" : 625 }, + "p626": { "x" : 626 }, + "p627": { "x" : 627 }, + "p628": { "x" : 628 }, + "p629": { "x" : 629 }, + "p630": { "x" : 630 }, + "p631": { "x" : 631 }, + "p632": { "x" : 632 }, + "p633": { "x" : 633 }, + "p634": { "x" : 634 }, + "p635": { "x" : 635 }, + "p636": { "x" : 636 }, + "p637": { "x" : 637 }, + "p638": { "x" : 638 }, + "p639": { "x" : 639 }, + "p640": { "x" : 640 }, + "p641": { "x" : 641 }, + "p642": { "x" : 642 }, + "p643": { "x" : 643 }, + "p644": { "x" : 644 }, + "p645": { "x" : 645 }, + "p646": { "x" : 646 }, + "p647": { "x" : 647 }, + "p648": { "x" : 648 }, + "p649": { "x" : 649 }, + "p650": { "x" : 650 }, + "p651": { "x" : 651 }, + "p652": { "x" : 652 }, + "p653": { "x" : 653 }, + "p654": { "x" : 654 }, + "p655": { "x" : 655 }, + "p656": { "x" : 656 }, + "p657": { "x" : 657 }, + "p658": { "x" : 658 }, + "p659": { "x" : 659 }, + "p660": { "x" : 660 }, + "p661": { "x" : 661 }, + "p662": { "x" : 662 }, + "p663": { "x" : 663 }, + "p664": { "x" : 664 }, + "p665": { "x" : 665 }, + "p666": { "x" : 666 }, + "p667": { "x" : 667 }, + "p668": { "x" : 668 }, + "p669": { "x" : 669 }, + "p670": { "x" : 670 }, + "p671": { "x" : 671 }, + "p672": { "x" : 672 }, + "p673": { "x" : 673 }, + "p674": { "x" : 674 }, + "p675": { "x" : 675 }, + "p676": { "x" : 676 }, + "p677": { "x" : 677 }, + "p678": { "x" : 678 }, + "p679": { "x" : 679 }, + "p680": { "x" : 680 }, + "p681": { "x" : 681 }, + "p682": { "x" : 682 }, + "p683": { "x" : 683 }, + "p684": { "x" : 684 }, + "p685": { "x" : 685 }, + "p686": { "x" : 686 }, + "p687": { "x" : 687 }, + "p688": { "x" : 688 }, + "p689": { "x" : 689 }, + "p690": { "x" : 690 }, + "p691": { "x" : 691 }, + "p692": { "x" : 692 }, + "p693": { "x" : 693 }, + "p694": { "x" : 694 }, + "p695": { "x" : 695 }, + "p696": { "x" : 696 }, + "p697": { "x" : 697 }, + "p698": { "x" : 698 }, + "p699": { "x" : 699 }, + "p700": { "x" : 700 }, + "p701": { "x" : 701 }, + "p702": { "x" : 702 }, + "p703": { "x" : 703 }, + "p704": { "x" : 704 }, + "p705": { "x" : 705 }, + "p706": { "x" : 706 }, + "p707": { "x" : 707 }, + "p708": { "x" : 708 }, + "p709": { "x" : 709 }, + "p710": { "x" : 710 }, + "p711": { "x" : 711 }, + "p712": { "x" : 712 }, + "p713": { "x" : 713 }, + "p714": { "x" : 714 }, + "p715": { "x" : 715 }, + "p716": { "x" : 716 }, + "p717": { "x" : 717 }, + "p718": { "x" : 718 }, + "p719": { "x" : 719 }, + "p720": { "x" : 720 }, + "p721": { "x" : 721 }, + "p722": { "x" : 722 }, + "p723": { "x" : 723 }, + "p724": { "x" : 724 }, + "p725": { "x" : 725 }, + "p726": { "x" : 726 }, + "p727": { "x" : 727 }, + "p728": { "x" : 728 }, + "p729": { "x" : 729 }, + "p730": { "x" : 730 }, + "p731": { "x" : 731 }, + "p732": { "x" : 732 }, + "p733": { "x" : 733 }, + "p734": { "x" : 734 }, + "p735": { "x" : 735 }, + "p736": { "x" : 736 }, + "p737": { "x" : 737 }, + "p738": { "x" : 738 }, + "p739": { "x" : 739 }, + "p740": { "x" : 740 }, + "p741": { "x" : 741 }, + "p742": { "x" : 742 }, + "p743": { "x" : 743 }, + "p744": { "x" : 744 }, + "p745": { "x" : 745 }, + "p746": { "x" : 746 }, + "p747": { "x" : 747 }, + "p748": { "x" : 748 }, + "p749": { "x" : 749 }, + "p750": { "x" : 750 }, + "p751": { "x" : 751 }, + "p752": { "x" : 752 }, + "p753": { "x" : 753 }, + "p754": { "x" : 754 }, + "p755": { "x" : 755 }, + "p756": { "x" : 756 }, + "p757": { "x" : 757 }, + "p758": { "x" : 758 }, + "p759": { "x" : 759 }, + "p760": { "x" : 760 }, + "p761": { "x" : 761 }, + "p762": { "x" : 762 }, + "p763": { "x" : 763 }, + "p764": { "x" : 764 }, + "p765": { "x" : 765 }, + "p766": { "x" : 766 }, + "p767": { "x" : 767 }, + "p768": { "x" : 768 }, + "p769": { "x" : 769 }, + "p770": { "x" : 770 }, + "p771": { "x" : 771 }, + "p772": { "x" : 772 }, + "p773": { "x" : 773 }, + "p774": { "x" : 774 }, + "p775": { "x" : 775 }, + "p776": { "x" : 776 }, + "p777": { "x" : 777 }, + "p778": { "x" : 778 }, + "p779": { "x" : 779 }, + "p780": { "x" : 780 }, + "p781": { "x" : 781 }, + "p782": { "x" : 782 }, + "p783": { "x" : 783 }, + "p784": { "x" : 784 }, + "p785": { "x" : 785 }, + "p786": { "x" : 786 }, + "p787": { "x" : 787 }, + "p788": { "x" : 788 }, + "p789": { "x" : 789 }, + "p790": { "x" : 790 }, + "p791": { "x" : 791 }, + "p792": { "x" : 792 }, + "p793": { "x" : 793 }, + "p794": { "x" : 794 }, + "p795": { "x" : 795 }, + "p796": { "x" : 796 }, + "p797": { "x" : 797 }, + "p798": { "x" : 798 }, + "p799": { "x" : 799 }, + "p800": { "x" : 800 }, + "p801": { "x" : 801 }, + "p802": { "x" : 802 }, + "p803": { "x" : 803 }, + "p804": { "x" : 804 }, + "p805": { "x" : 805 }, + "p806": { "x" : 806 }, + "p807": { "x" : 807 }, + "p808": { "x" : 808 }, + "p809": { "x" : 809 }, + "p810": { "x" : 810 }, + "p811": { "x" : 811 }, + "p812": { "x" : 812 }, + "p813": { "x" : 813 }, + "p814": { "x" : 814 }, + "p815": { "x" : 815 }, + "p816": { "x" : 816 }, + "p817": { "x" : 817 }, + "p818": { "x" : 818 }, + "p819": { "x" : 819 }, + "p820": { "x" : 820 }, + "p821": { "x" : 821 }, + "p822": { "x" : 822 }, + "p823": { "x" : 823 }, + "p824": { "x" : 824 }, + "p825": { "x" : 825 }, + "p826": { "x" : 826 }, + "p827": { "x" : 827 }, + "p828": { "x" : 828 }, + "p829": { "x" : 829 }, + "p830": { "x" : 830 }, + "p831": { "x" : 831 }, + "p832": { "x" : 832 }, + "p833": { "x" : 833 }, + "p834": { "x" : 834 }, + "p835": { "x" : 835 }, + "p836": { "x" : 836 }, + "p837": { "x" : 837 }, + "p838": { "x" : 838 }, + "p839": { "x" : 839 }, + "p840": { "x" : 840 }, + "p841": { "x" : 841 }, + "p842": { "x" : 842 }, + "p843": { "x" : 843 }, + "p844": { "x" : 844 }, + "p845": { "x" : 845 }, + "p846": { "x" : 846 }, + "p847": { "x" : 847 }, + "p848": { "x" : 848 }, + "p849": { "x" : 849 }, + "p850": { "x" : 850 }, + "p851": { "x" : 851 }, + "p852": { "x" : 852 }, + "p853": { "x" : 853 }, + "p854": { "x" : 854 }, + "p855": { "x" : 855 }, + "p856": { "x" : 856 }, + "p857": { "x" : 857 }, + "p858": { "x" : 858 }, + "p859": { "x" : 859 }, + "p860": { "x" : 860 }, + "p861": { "x" : 861 }, + "p862": { "x" : 862 }, + "p863": { "x" : 863 }, + "p864": { "x" : 864 }, + "p865": { "x" : 865 }, + "p866": { "x" : 866 }, + "p867": { "x" : 867 }, + "p868": { "x" : 868 }, + "p869": { "x" : 869 }, + "p870": { "x" : 870 }, + "p871": { "x" : 871 }, + "p872": { "x" : 872 }, + "p873": { "x" : 873 }, + "p874": { "x" : 874 }, + "p875": { "x" : 875 }, + "p876": { "x" : 876 }, + "p877": { "x" : 877 }, + "p878": { "x" : 878 }, + "p879": { "x" : 879 }, + "p880": { "x" : 880 }, + "p881": { "x" : 881 }, + "p882": { "x" : 882 }, + "p883": { "x" : 883 }, + "p884": { "x" : 884 }, + "p885": { "x" : 885 }, + "p886": { "x" : 886 }, + "p887": { "x" : 887 }, + "p888": { "x" : 888 }, + "p889": { "x" : 889 }, + "p890": { "x" : 890 }, + "p891": { "x" : 891 }, + "p892": { "x" : 892 }, + "p893": { "x" : 893 }, + "p894": { "x" : 894 }, + "p895": { "x" : 895 }, + "p896": { "x" : 896 }, + "p897": { "x" : 897 }, + "p898": { "x" : 898 }, + "p899": { "x" : 899 }, + "p900": { "x" : 900 }, + "p901": { "x" : 901 }, + "p902": { "x" : 902 }, + "p903": { "x" : 903 }, + "p904": { "x" : 904 }, + "p905": { "x" : 905 }, + "p906": { "x" : 906 }, + "p907": { "x" : 907 }, + "p908": { "x" : 908 }, + "p909": { "x" : 909 }, + "p910": { "x" : 910 }, + "p911": { "x" : 911 }, + "p912": { "x" : 912 }, + "p913": { "x" : 913 }, + "p914": { "x" : 914 }, + "p915": { "x" : 915 }, + "p916": { "x" : 916 }, + "p917": { "x" : 917 }, + "p918": { "x" : 918 }, + "p919": { "x" : 919 }, + "p920": { "x" : 920 }, + "p921": { "x" : 921 }, + "p922": { "x" : 922 }, + "p923": { "x" : 923 }, + "p924": { "x" : 924 }, + "p925": { "x" : 925 }, + "p926": { "x" : 926 }, + "p927": { "x" : 927 }, + "p928": { "x" : 928 }, + "p929": { "x" : 929 }, + "p930": { "x" : 930 }, + "p931": { "x" : 931 }, + "p932": { "x" : 932 }, + "p933": { "x" : 933 }, + "p934": { "x" : 934 }, + "p935": { "x" : 935 }, + "p936": { "x" : 936 }, + "p937": { "x" : 937 }, + "p938": { "x" : 938 }, + "p939": { "x" : 939 }, + "p940": { "x" : 940 }, + "p941": { "x" : 941 }, + "p942": { "x" : 942 }, + "p943": { "x" : 943 }, + "p944": { "x" : 944 }, + "p945": { "x" : 945 }, + "p946": { "x" : 946 }, + "p947": { "x" : 947 }, + "p948": { "x" : 948 }, + "p949": { "x" : 949 }, + "p950": { "x" : 950 }, + "p951": { "x" : 951 }, + "p952": { "x" : 952 }, + "p953": { "x" : 953 }, + "p954": { "x" : 954 }, + "p955": { "x" : 955 }, + "p956": { "x" : 956 }, + "p957": { "x" : 957 }, + "p958": { "x" : 958 }, + "p959": { "x" : 959 }, + "p960": { "x" : 960 }, + "p961": { "x" : 961 }, + "p962": { "x" : 962 }, + "p963": { "x" : 963 }, + "p964": { "x" : 964 }, + "p965": { "x" : 965 }, + "p966": { "x" : 966 }, + "p967": { "x" : 967 }, + "p968": { "x" : 968 }, + "p969": { "x" : 969 }, + "p970": { "x" : 970 }, + "p971": { "x" : 971 }, + "p972": { "x" : 972 }, + "p973": { "x" : 973 }, + "p974": { "x" : 974 }, + "p975": { "x" : 975 }, + "p976": { "x" : 976 }, + "p977": { "x" : 977 }, + "p978": { "x" : 978 }, + "p979": { "x" : 979 }, + "p980": { "x" : 980 }, + "p981": { "x" : 981 }, + "p982": { "x" : 982 }, + "p983": { "x" : 983 }, + "p984": { "x" : 984 }, + "p985": { "x" : 985 }, + "p986": { "x" : 986 }, + "p987": { "x" : 987 }, + "p988": { "x" : 988 }, + "p989": { "x" : 989 }, + "p990": { "x" : 990 }, + "p991": { "x" : 991 }, + "p992": { "x" : 992 }, + "p993": { "x" : 993 }, + "p994": { "x" : 994 }, + "p995": { "x" : 995 }, + "p996": { "x" : 996 }, + "p997": { "x" : 997 }, + "p998": { "x" : 998 }, + "p999": { "x" : 999 } +}; + +for (var i = 0; i < 1000; i++) { + var value = obj["p" + i]; + Assert.assertTrue(typeof value === "object"); + Assert.assertTrue(value.x === i); +} From d6aef89288c0f71dc4dc0dd7dc5a3e041f0c91a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= Date: Mon, 9 Mar 2015 11:34:48 +0100 Subject: [PATCH 67/97] 8074556: Functions should not share allocator maps Reviewed-by: lagergren, sundar --- .../internal/codegen/FindScopeDepths.java | 3 +- .../codegen/ObjectClassGenerator.java | 46 ++++------------ .../internal/runtime/AllocationStrategy.java | 39 ++++---------- .../RecompilableScriptFunctionData.java | 7 ++- nashorn/test/script/basic/JDK-8074556.js | 52 +++++++++++++++++++ 5 files changed, 75 insertions(+), 72 deletions(-) create mode 100644 nashorn/test/script/basic/JDK-8074556.js diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java index 431244dc3c6..b45b9867116 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java @@ -32,7 +32,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; -import jdk.nashorn.internal.codegen.ObjectClassGenerator.AllocatorDescriptor; import jdk.nashorn.internal.ir.Block; import jdk.nashorn.internal.ir.FunctionNode; import jdk.nashorn.internal.ir.FunctionNode.CompilationState; @@ -208,7 +207,7 @@ final class FindScopeDepths extends NodeVisitor implements Logga final RecompilableScriptFunctionData data = new RecompilableScriptFunctionData( newFunctionNode, compiler.getCodeInstaller(), - new AllocatorDescriptor(newFunctionNode.getThisProperties()), + ObjectClassGenerator.createAllocationStrategy(newFunctionNode.getThisProperties()), nestedFunctions, externalSymbolDepths.get(fnId), internalSymbols.get(fnId), diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectClassGenerator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectClassGenerator.java index a5a5cf6f31e..f1265132442 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectClassGenerator.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectClassGenerator.java @@ -56,6 +56,7 @@ import java.util.List; import jdk.nashorn.internal.codegen.ClassEmitter.Flag; import jdk.nashorn.internal.codegen.types.Type; import jdk.nashorn.internal.runtime.AccessorProperty; +import jdk.nashorn.internal.runtime.AllocationStrategy; import jdk.nashorn.internal.runtime.Context; import jdk.nashorn.internal.runtime.FunctionScope; import jdk.nashorn.internal.runtime.JSType; @@ -826,44 +827,15 @@ public final class ObjectClassGenerator implements Loggable { } /** - * Describes the allocator class name and property map for a constructor function with the specified + * Creates the allocator class name and property map for a constructor function with the specified * number of "this" properties that it initializes. - * + * @param thisProperties number of properties assigned to "this" + * @return the allocation strategy */ - public static class AllocatorDescriptor { - private final String allocatorClassName; - private final PropertyMap allocatorMap; - - /** - * Creates a new allocator descriptor - * @param thisProperties the number of "this" properties that the function initializes - */ - public AllocatorDescriptor(final int thisProperties) { - final int paddedFieldCount = getPaddedFieldCount(thisProperties); - this.allocatorClassName = Compiler.binaryName(getClassName(paddedFieldCount)); - this.allocatorMap = PropertyMap.newMap(null, allocatorClassName, 0, paddedFieldCount, 0); - } - - /** - * Returns the name of the class that the function allocates - * @return the name of the class that the function allocates - */ - public String getAllocatorClassName() { - return allocatorClassName; - } - - /** - * Returns the allocator map for the function. - * @return the allocator map for the function. - */ - public PropertyMap getAllocatorMap() { - return allocatorMap; - } - - @Override - public String toString() { - return "AllocatorDescriptor[allocatorClassName=" + allocatorClassName + ", allocatorMap.size=" + - allocatorMap.size() + "]"; - } + static AllocationStrategy createAllocationStrategy(final int thisProperties) { + final int paddedFieldCount = getPaddedFieldCount(thisProperties); + final String allocatorClassName = Compiler.binaryName(getClassName(paddedFieldCount)); + final PropertyMap allocatorMap = PropertyMap.newMap(null, allocatorClassName, 0, paddedFieldCount, 0); + return new AllocationStrategy(allocatorMap, allocatorClassName); } } diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AllocationStrategy.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AllocationStrategy.java index e4d6ccb10ef..32f73459519 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AllocationStrategy.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AllocationStrategy.java @@ -30,22 +30,15 @@ import java.io.Serializable; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import jdk.nashorn.internal.codegen.CompilerConstants; -import jdk.nashorn.internal.codegen.ObjectClassGenerator.AllocatorDescriptor; /** - * Encapsulates the allocation strategy for a function when used as a constructor. Basically the same as - * {@link AllocatorDescriptor}, but with an additionally cached resolved method handle. There is also a - * canonical default allocation strategy for functions that don't assign any "this" properties (vast majority - * of all functions), therefore saving some storage space in {@link RecompilableScriptFunctionData} that would - * otherwise be lost to identical tuples of (map, className, handle) fields. + * Encapsulates the allocation strategy for a function when used as a constructor. */ -final class AllocationStrategy implements Serializable { +final public class AllocationStrategy implements Serializable { private static final long serialVersionUID = 1L; private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup(); - private static final AllocationStrategy DEFAULT_STRATEGY = new AllocationStrategy(new AllocatorDescriptor(0)); - /** Allocator map from allocator descriptor */ private final PropertyMap allocatorMap; @@ -55,19 +48,15 @@ final class AllocationStrategy implements Serializable { /** lazily generated allocator */ private transient MethodHandle allocator; - private AllocationStrategy(final AllocatorDescriptor desc) { - this.allocatorMap = desc.getAllocatorMap(); + /** + * Construct an allocation strategy with the given map and class name. + * @param allocatorMap the property map + * @param className the class name + */ + public AllocationStrategy(final PropertyMap allocatorMap, final String className) { + this.allocatorMap = allocatorMap; // These classes get loaded, so an interned variant of their name is most likely around anyway. - this.allocatorClassName = desc.getAllocatorClassName().intern(); - } - - private boolean matches(final AllocatorDescriptor desc) { - return desc.getAllocatorMap().size() == allocatorMap.size() && - desc.getAllocatorClassName().equals(allocatorClassName); - } - - static AllocationStrategy get(final AllocatorDescriptor desc) { - return DEFAULT_STRATEGY.matches(desc) ? DEFAULT_STRATEGY : new AllocationStrategy(desc); + this.allocatorClassName = className.intern(); } PropertyMap getAllocatorMap() { @@ -88,14 +77,6 @@ final class AllocationStrategy implements Serializable { } } - private Object readResolve() { - if(allocatorMap.size() == DEFAULT_STRATEGY.allocatorMap.size() && - allocatorClassName.equals(DEFAULT_STRATEGY.allocatorClassName)) { - return DEFAULT_STRATEGY; - } - return this; - } - @Override public String toString() { return "AllocationStrategy[allocatorClassName=" + allocatorClassName + ", allocatorMap.size=" + diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java index 06414edbca0..c65b031e010 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java @@ -43,7 +43,6 @@ import jdk.nashorn.internal.codegen.Compiler.CompilationPhases; import jdk.nashorn.internal.codegen.CompilerConstants; import jdk.nashorn.internal.codegen.FunctionSignature; import jdk.nashorn.internal.codegen.Namespace; -import jdk.nashorn.internal.codegen.ObjectClassGenerator.AllocatorDescriptor; import jdk.nashorn.internal.codegen.OptimisticTypesPersistence; import jdk.nashorn.internal.codegen.TypeMap; import jdk.nashorn.internal.codegen.types.Type; @@ -126,7 +125,7 @@ public final class RecompilableScriptFunctionData extends ScriptFunctionData imp * * @param functionNode functionNode that represents this function code * @param installer installer for code regeneration versions of this function - * @param allocationDescriptor descriptor for the allocation behavior when this function is used as a constructor + * @param allocationStrategy strategy for the allocation behavior when this function is used as a constructor * @param nestedFunctions nested function map * @param externalScopeDepths external scope depths * @param internalSymbols internal symbols to method, defined in its scope @@ -135,7 +134,7 @@ public final class RecompilableScriptFunctionData extends ScriptFunctionData imp public RecompilableScriptFunctionData( final FunctionNode functionNode, final CodeInstaller installer, - final AllocatorDescriptor allocationDescriptor, + final AllocationStrategy allocationStrategy, final Map nestedFunctions, final Map externalScopeDepths, final Set internalSymbols, @@ -153,7 +152,7 @@ public final class RecompilableScriptFunctionData extends ScriptFunctionData imp this.endParserState = functionNode.getEndParserState(); this.token = tokenFor(functionNode); this.installer = installer; - this.allocationStrategy = AllocationStrategy.get(allocationDescriptor); + this.allocationStrategy = allocationStrategy; this.nestedFunctions = smallMap(nestedFunctions); this.externalScopeDepths = smallMap(externalScopeDepths); this.internalSymbols = smallSet(new HashSet<>(internalSymbols)); diff --git a/nashorn/test/script/basic/JDK-8074556.js b/nashorn/test/script/basic/JDK-8074556.js new file mode 100644 index 00000000000..e3fb0d94fbb --- /dev/null +++ b/nashorn/test/script/basic/JDK-8074556.js @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * JDK-8074556: Functions should not share allocator maps + * + * @test + * @run + */ + +function A () { + return this; +} + +function B() { + return this; +} + +A.prototype.x = "x"; +A.prototype.y = "y"; +B.prototype.y = "y"; // same properties but different order +B.prototype.x = "x"; + +function test(o) { + Assert.assertEquals(o.x, "x"); + Assert.assertEquals(o.y, "y"); +} + +test(new A()); +test(new B()); +test(new A()); +test(new B()); From 0ed9eb856c9566abe8e493c1aaa693b81ee00fa2 Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Mon, 9 Mar 2015 20:14:10 +0530 Subject: [PATCH 68/97] 8074671: Nashorn Parser API Reviewed-by: darcy, forax, attila, hannesw --- nashorn/make/build.xml | 22 +- nashorn/make/nbproject/project.xml | 10 +- nashorn/make/project.properties | 30 +- nashorn/samples/evalcheck.js | 58 + nashorn/samples/withcheck.js | 38 + .../jdk/nashorn/api/tree/ArrayAccessTree.java | 53 + .../nashorn/api/tree/ArrayAccessTreeImpl.java | 59 + .../nashorn/api/tree/ArrayLiteralTree.java | 43 + .../api/tree/ArrayLiteralTreeImpl.java | 53 + .../jdk/nashorn/api/tree/AssignmentTree.java | 53 + .../nashorn/api/tree/AssignmentTreeImpl.java | 61 + .../jdk/nashorn/api/tree/BinaryTree.java | 54 + .../jdk/nashorn/api/tree/BinaryTreeImpl.java | 61 + .../jdk/nashorn/api/tree/BlockTree.java | 50 + .../jdk/nashorn/api/tree/BlockTreeImpl.java | 59 + .../jdk/nashorn/api/tree/BreakTree.java | 49 + .../jdk/nashorn/api/tree/BreakTreeImpl.java | 53 + .../jdk/nashorn/api/tree/CaseTree.java | 59 + .../jdk/nashorn/api/tree/CaseTreeImpl.java | 62 + .../jdk/nashorn/api/tree/CatchTree.java | 62 + .../jdk/nashorn/api/tree/CatchTreeImpl.java | 69 + .../nashorn/api/tree/CompilationUnitTree.java | 66 + .../api/tree/CompilationUnitTreeImpl.java | 73 + .../api/tree/CompoundAssignmentTree.java | 54 + .../api/tree/CompoundAssignmentTreeImpl.java | 63 + .../api/tree/ConditionalExpressionTree.java | 60 + .../tree/ConditionalExpressionTreeImpl.java | 67 + .../nashorn/api/tree/ConditionalLoopTree.java | 41 + .../jdk/nashorn/api/tree/ContinueTree.java | 48 + .../nashorn/api/tree/ContinueTreeImpl.java | 53 + .../jdk/nashorn/api/tree/DebuggerTree.java | 40 + .../nashorn/api/tree/DebuggerTreeImpl.java | 44 + .../jdk/nashorn/api/tree/Diagnostic.java | 151 + .../jdk/nashorn/api/tree/DiagnosticImpl.java | 81 + .../nashorn/api/tree/DiagnosticListener.java | 42 + .../jdk/nashorn/api/tree/DoWhileLoopTree.java | 55 + .../nashorn/api/tree/DoWhileLoopTreeImpl.java | 60 + .../nashorn/api/tree/EmptyStatementTree.java | 39 + .../api/tree/EmptyStatementTreeImpl.java | 44 + .../jdk/nashorn/api/tree/ErroneousTree.java | 35 + .../nashorn/api/tree/ErroneousTreeImpl.java | 44 + .../api/tree/ExpressionStatementTree.java | 46 + .../api/tree/ExpressionStatementTreeImpl.java | 52 + .../jdk/nashorn/api/tree/ExpressionTree.java | 35 + .../nashorn/api/tree/ExpressionTreeImpl.java | 34 + .../jdk/nashorn/api/tree/ForInLoopTree.java | 68 + .../nashorn/api/tree/ForInLoopTreeImpl.java | 77 + .../jdk/nashorn/api/tree/ForLoopTree.java | 68 + .../jdk/nashorn/api/tree/ForLoopTreeImpl.java | 79 + .../nashorn/api/tree/FunctionCallTree.java | 57 + .../api/tree/FunctionCallTreeImpl.java | 61 + .../api/tree/FunctionDeclarationTree.java | 71 + .../api/tree/FunctionDeclarationTreeImpl.java | 80 + .../api/tree/FunctionExpressionTree.java | 71 + .../api/tree/FunctionExpressionTreeImpl.java | 85 + .../jdk/nashorn/api/tree/GotoTree.java | 45 + .../jdk/nashorn/api/tree/IRTranslator.java | 517 ++ .../jdk/nashorn/api/tree/IdentifierTree.java | 46 + .../nashorn/api/tree/IdentifierTreeImpl.java | 53 + .../classes/jdk/nashorn/api/tree/IfTree.java | 67 + .../jdk/nashorn/api/tree/IfTreeImpl.java | 69 + .../jdk/nashorn/api/tree/InstanceOfTree.java | 53 + .../nashorn/api/tree/InstanceOfTreeImpl.java | 58 + .../api/tree/LabeledStatementTree.java | 53 + .../api/tree/LabeledStatementTreeImpl.java | 60 + .../classes/jdk/nashorn/api/tree/LineMap.java | 54 + .../jdk/nashorn/api/tree/LineMapImpl.java | 46 + .../jdk/nashorn/api/tree/LiteralTree.java | 47 + .../jdk/nashorn/api/tree/LiteralTreeImpl.java | 67 + .../jdk/nashorn/api/tree/LoopTree.java | 41 + .../nashorn/api/tree/MemberSelectTree.java | 53 + .../api/tree/MemberSelectTreeImpl.java | 59 + .../classes/jdk/nashorn/api/tree/NewTree.java | 50 + .../jdk/nashorn/api/tree/NewTreeImpl.java | 53 + .../nashorn/api/tree/ObjectLiteralTree.java | 43 + .../api/tree/ObjectLiteralTreeImpl.java | 53 + .../nashorn/api/tree/ParenthesizedTree.java | 47 + .../classes/jdk/nashorn/api/tree/Parser.java | 160 + .../jdk/nashorn/api/tree/ParserImpl.java | 145 + .../jdk/nashorn/api/tree/PropertyTree.java | 64 + .../nashorn/api/tree/PropertyTreeImpl.java | 76 + .../nashorn/api/tree/RegExpLiteralTree.java | 48 + .../api/tree/RegExpLiteralTreeImpl.java | 62 + .../jdk/nashorn/api/tree/ReturnTree.java | 48 + .../jdk/nashorn/api/tree/ReturnTreeImpl.java | 52 + .../api/tree/SimpleTreeVisitorES5_1.java | 390 + .../jdk/nashorn/api/tree/StatementTree.java | 36 + .../nashorn/api/tree/StatementTreeImpl.java | 39 + .../jdk/nashorn/api/tree/SwitchTree.java | 58 + .../jdk/nashorn/api/tree/SwitchTreeImpl.java | 61 + .../jdk/nashorn/api/tree/ThrowTree.java | 46 + .../jdk/nashorn/api/tree/ThrowTreeImpl.java | 51 + .../classes/jdk/nashorn/api/tree/Tree.java | 599 ++ .../jdk/nashorn/api/tree/TreeImpl.java | 154 + .../jdk/nashorn/api/tree/TreeVisitor.java | 438 + .../classes/jdk/nashorn/api/tree/TryTree.java | 67 + .../jdk/nashorn/api/tree/TryTreeImpl.java | 69 + .../jdk/nashorn/api/tree/UnaryTree.java | 49 + .../jdk/nashorn/api/tree/UnaryTreeImpl.java | 53 + .../api/tree/UnknownTreeException.java | 83 + .../jdk/nashorn/api/tree/VariableTree.java | 54 + .../nashorn/api/tree/VariableTreeImpl.java | 59 + .../jdk/nashorn/api/tree/WhileLoopTree.java | 54 + .../nashorn/api/tree/WhileLoopTreeImpl.java | 60 + .../jdk/nashorn/api/tree/WithTree.java | 54 + .../jdk/nashorn/api/tree/WithTreeImpl.java | 59 + .../jdk/nashorn/api/tree/package-info.java | 75 + .../jdk/nashorn/internal/codegen/Lower.java | 10 + .../jdk/nashorn/internal/ir/Block.java | 20 +- .../nashorn/internal/ir/BlockStatement.java | 9 + .../jdk/nashorn/internal/ir/DebuggerNode.java | 63 + .../jdk/nashorn/internal/ir/ErrorNode.java | 69 + .../jdk/nashorn/internal/ir/LiteralNode.java | 29 + .../nashorn/internal/ir/debug/JSONWriter.java | 30 +- .../internal/ir/visitor/NodeVisitor.java | 43 + .../jdk/nashorn/internal/parser/Parser.java | 24 +- .../jdk/nashorn/internal/runtime/Source.java | 26 +- .../internal/runtime/options/Options.java | 1 + .../basic/parser/tryCatchStat.js.EXPECTED | 486 +- nashorn/test/script/basic/parser/util.js | 2 +- nashorn/test/script/nosecurity/parserapi.js | 126 + .../script/nosecurity/parserapi.js.EXPECTED | 7015 +++++++++++++++++ .../nosecurity/parserapi_const_as_var.js | 39 + .../parserapi_const_as_var.js.EXPECTED | 3 + .../script/nosecurity/parserapi_empty_stat.js | 45 + .../parserapi_empty_stat.js.EXPECTED | 1 + .../test/script/nosecurity/parserapi_nse.js | 102 + .../nosecurity/parserapi_nse.js.EXPECTED | 43 + .../script/nosecurity/parserapi_scripting.js | 47 + .../parserapi_scripting.js.EXPECTED | 9 + .../script/nosecurity/parserapi_strict.js | 59 + .../nosecurity/parserapi_strict.js.EXPECTED | 16 + .../parsernegativetests/caseoutofswitch.js | 32 + .../parsernegativetests/illegalbreak.js | 30 + .../parsernegativetests/illegalcontinue.js | 30 + .../parsernegativetests/illegallvalue.js | 31 + .../parsernegativetests/illegaloperator.js | 29 + .../parsernegativetests/keywordident.js | 30 + .../parsernegativetests/parenmissing.js | 30 + .../parsernegativetests/repeatedproperty.js | 33 + .../strict_repeatedproperty.js | 32 + .../parsernegativetests/strict_repeatparam.js | 31 + .../parsernegativetests/strict_with.js | 31 + .../parsernegativetests/toplevelreturn.js | 30 + .../nosecurity/parsertests/array_literal.js | 33 + .../nosecurity/parsertests/assignmentExpr.js | 42 + .../nosecurity/parsertests/binaryExpr.js | 51 + .../script/nosecurity/parsertests/block.js | 31 + .../nosecurity/parsertests/breakStat.js | 32 + .../script/nosecurity/parsertests/condExpr.js | 31 + .../nosecurity/parsertests/continueStat.js | 32 + .../nosecurity/parsertests/debuggerStat.js | 30 + .../nosecurity/parsertests/functions.js | 36 + .../script/nosecurity/parsertests/ifStat.js | 31 + .../nosecurity/parsertests/labelledStat.js | 31 + .../script/nosecurity/parsertests/lhsExpr.js | 44 + .../script/nosecurity/parsertests/loopStat.js | 34 + .../nosecurity/parsertests/objectLitExpr.js | 34 + .../nosecurity/parsertests/parenExpr.js | 31 + .../nosecurity/parsertests/primaryExpr.js | 42 + .../nosecurity/parsertests/regexp_literal.js | 32 + .../nosecurity/parsertests/returnStat.js | 32 + .../nosecurity/parsertests/switchStat.js | 32 + .../nosecurity/parsertests/throwStat.js | 34 + .../nosecurity/parsertests/tryCatchStat.js | 35 + .../nosecurity/parsertests/unaryExpr.js | 40 + .../nosecurity/parsertests/useStrict.js | 31 + .../script/nosecurity/parsertests/varDecl.js | 37 + .../script/nosecurity/parsertests/withStat.js | 30 + .../test/script/nosecurity/parservisitor.js | 380 + .../nosecurity/parservisitor.js.EXPECTED | 87 + .../jdk/nashorn/api/tree/ParseAPITest.java | 188 + .../internal/codegen/CompilerTest.java | 1 - .../nashorn/internal/parser/ParserTest.java | 1 - 174 files changed, 17893 insertions(+), 317 deletions(-) create mode 100644 nashorn/samples/evalcheck.js create mode 100644 nashorn/samples/withcheck.js create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalLoopTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Diagnostic.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticListener.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/GotoTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IRTranslator.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMap.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMapImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LoopTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParenthesizedTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Parser.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParserImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SimpleTreeVisitorES5_1.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Tree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeVisitor.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnknownTreeException.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTree.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTreeImpl.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/package-info.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/DebuggerNode.java create mode 100644 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ErrorNode.java create mode 100644 nashorn/test/script/nosecurity/parserapi.js create mode 100644 nashorn/test/script/nosecurity/parserapi.js.EXPECTED create mode 100644 nashorn/test/script/nosecurity/parserapi_const_as_var.js create mode 100644 nashorn/test/script/nosecurity/parserapi_const_as_var.js.EXPECTED create mode 100644 nashorn/test/script/nosecurity/parserapi_empty_stat.js create mode 100644 nashorn/test/script/nosecurity/parserapi_empty_stat.js.EXPECTED create mode 100644 nashorn/test/script/nosecurity/parserapi_nse.js create mode 100644 nashorn/test/script/nosecurity/parserapi_nse.js.EXPECTED create mode 100644 nashorn/test/script/nosecurity/parserapi_scripting.js create mode 100644 nashorn/test/script/nosecurity/parserapi_scripting.js.EXPECTED create mode 100644 nashorn/test/script/nosecurity/parserapi_strict.js create mode 100644 nashorn/test/script/nosecurity/parserapi_strict.js.EXPECTED create mode 100644 nashorn/test/script/nosecurity/parsernegativetests/caseoutofswitch.js create mode 100644 nashorn/test/script/nosecurity/parsernegativetests/illegalbreak.js create mode 100644 nashorn/test/script/nosecurity/parsernegativetests/illegalcontinue.js create mode 100644 nashorn/test/script/nosecurity/parsernegativetests/illegallvalue.js create mode 100644 nashorn/test/script/nosecurity/parsernegativetests/illegaloperator.js create mode 100644 nashorn/test/script/nosecurity/parsernegativetests/keywordident.js create mode 100644 nashorn/test/script/nosecurity/parsernegativetests/parenmissing.js create mode 100644 nashorn/test/script/nosecurity/parsernegativetests/repeatedproperty.js create mode 100644 nashorn/test/script/nosecurity/parsernegativetests/strict_repeatedproperty.js create mode 100644 nashorn/test/script/nosecurity/parsernegativetests/strict_repeatparam.js create mode 100644 nashorn/test/script/nosecurity/parsernegativetests/strict_with.js create mode 100644 nashorn/test/script/nosecurity/parsernegativetests/toplevelreturn.js create mode 100644 nashorn/test/script/nosecurity/parsertests/array_literal.js create mode 100644 nashorn/test/script/nosecurity/parsertests/assignmentExpr.js create mode 100644 nashorn/test/script/nosecurity/parsertests/binaryExpr.js create mode 100644 nashorn/test/script/nosecurity/parsertests/block.js create mode 100644 nashorn/test/script/nosecurity/parsertests/breakStat.js create mode 100644 nashorn/test/script/nosecurity/parsertests/condExpr.js create mode 100644 nashorn/test/script/nosecurity/parsertests/continueStat.js create mode 100644 nashorn/test/script/nosecurity/parsertests/debuggerStat.js create mode 100644 nashorn/test/script/nosecurity/parsertests/functions.js create mode 100644 nashorn/test/script/nosecurity/parsertests/ifStat.js create mode 100644 nashorn/test/script/nosecurity/parsertests/labelledStat.js create mode 100644 nashorn/test/script/nosecurity/parsertests/lhsExpr.js create mode 100644 nashorn/test/script/nosecurity/parsertests/loopStat.js create mode 100644 nashorn/test/script/nosecurity/parsertests/objectLitExpr.js create mode 100644 nashorn/test/script/nosecurity/parsertests/parenExpr.js create mode 100644 nashorn/test/script/nosecurity/parsertests/primaryExpr.js create mode 100644 nashorn/test/script/nosecurity/parsertests/regexp_literal.js create mode 100644 nashorn/test/script/nosecurity/parsertests/returnStat.js create mode 100644 nashorn/test/script/nosecurity/parsertests/switchStat.js create mode 100644 nashorn/test/script/nosecurity/parsertests/throwStat.js create mode 100644 nashorn/test/script/nosecurity/parsertests/tryCatchStat.js create mode 100644 nashorn/test/script/nosecurity/parsertests/unaryExpr.js create mode 100644 nashorn/test/script/nosecurity/parsertests/useStrict.js create mode 100644 nashorn/test/script/nosecurity/parsertests/varDecl.js create mode 100644 nashorn/test/script/nosecurity/parsertests/withStat.js create mode 100644 nashorn/test/script/nosecurity/parservisitor.js create mode 100644 nashorn/test/script/nosecurity/parservisitor.js.EXPECTED create mode 100644 nashorn/test/src/jdk/nashorn/api/tree/ParseAPITest.java diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml index 9bc4d670618..bd85a06aba9 100644 --- a/nashorn/make/build.xml +++ b/nashorn/make/build.xml @@ -98,7 +98,7 @@ - + @@ -209,7 +209,7 @@ - @@ -227,7 +227,7 @@ - @@ -314,6 +314,15 @@ grant codeBase "file:/${basedir}/${nashorn.internal.tests.jar}" { permission java.security.AllPermission; }; +grant codeBase "file:/${basedir}/${nashorn.api.tests.jar}" { + permission java.util.PropertyPermission "parserapitest.*", "read"; + permission java.util.PropertyPermission "test.*", "read"; + permission java.util.PropertyPermission "test262.*", "read"; + permission java.io.FilePermission "${basedir}/test/-","read"; + permission java.io.FilePermission "$${user.dir}", "read"; + permission java.util.PropertyPermission "user.dir", "read"; +}; + grant codeBase "file:/${basedir}/${file.reference.testng.jar}" { permission java.security.AllPermission; }; @@ -395,6 +404,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { + @@ -440,7 +450,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { + verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}"> @@ -466,7 +476,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { - + @@ -478,7 +488,7 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" { - + diff --git a/nashorn/make/nbproject/project.xml b/nashorn/make/nbproject/project.xml index 94d0c147019..b39e8734cb6 100644 --- a/nashorn/make/nbproject/project.xml +++ b/nashorn/make/nbproject/project.xml @@ -2,21 +2,21 @@