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

Merge

Browse Source
This commit is contained in:
Jesper Wilhelmsson 2019-06-25 14:36:31 +02:00
commit a1e6e5f785
16 changed files with 289 additions and 383 deletions
src
hotspot/share/jvmci
jvmciCompilerToVM.cpp
java.base/share/classes/javax/net/ssl
KeyManagerFactory.javaTrustManagerFactory.java
java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files
properties.html
jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot
CompilerToVM.javaHotSpotConstantPool.java
test
hotspot/jtreg
compiler/jvmci
common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot
CompilerToVMHelper.java
compilerToVM
ResolveConstantInPoolTest.javaResolvePossiblyCachedConstantInPoolTest.java
vmTestbase/nsk/jvmti/scenarios/contention
TC02
tc02t001.java
tc02t001
tc02t001.cpp
TC04
tc04t001.java
jdk
ProblemList.txt
jdk/internal/platform/docker
TestDockerMemoryMetrics.javaTestSystemMetrics.java
lib/jdk/test/lib/containers/cgroup
MetricsTester.java

7
src/hotspot/share/jvmci/jvmciCompilerToVM.cpp

@ -609,12 +609,6 @@ C2V_VMENTRY_NULL(jobject, lookupClass, (JNIEnv* env, jobject, jclass mirror))
return JVMCIENV->get_jobject(result);
}
C2V_VMENTRY_NULL(jobject, resolveConstantInPool, (JNIEnv* env, jobject, jobject jvmci_constant_pool, jint index))
constantPoolHandle cp = JVMCIENV->asConstantPool(jvmci_constant_pool);
oop result = cp->resolve_constant_at(index, CHECK_NULL);
return JVMCIENV->get_jobject(JVMCIENV->get_object_constant(result));
C2V_END
C2V_VMENTRY_NULL(jobject, resolvePossiblyCachedConstantInPool, (JNIEnv* env, jobject, jobject jvmci_constant_pool, jint index))
constantPoolHandle cp = JVMCIENV->asConstantPool(jvmci_constant_pool);
oop result = cp->resolve_possibly_cached_constant_at(index, CHECK_NULL);
@ -2673,7 +2667,6 @@ JNINativeMethod CompilerToVM::methods[] = {
{CC "lookupAppendixInPool", CC "(" HS_CONSTANT_POOL "I)" OBJECTCONSTANT, FN_PTR(lookupAppendixInPool)},
{CC "lookupMethodInPool", CC "(" HS_CONSTANT_POOL "IB)" HS_RESOLVED_METHOD, FN_PTR(lookupMethodInPool)},
{CC "constantPoolRemapInstructionOperandFromCache", CC "(" HS_CONSTANT_POOL "I)I", FN_PTR(constantPoolRemapInstructionOperandFromCache)},
{CC "resolveConstantInPool", CC "(" HS_CONSTANT_POOL "I)" OBJECTCONSTANT, FN_PTR(resolveConstantInPool)},
{CC "resolvePossiblyCachedConstantInPool", CC "(" HS_CONSTANT_POOL "I)" OBJECTCONSTANT, FN_PTR(resolvePossiblyCachedConstantInPool)},
{CC "resolveTypeInPool", CC "(" HS_CONSTANT_POOL "I)" HS_RESOLVED_KLASS, FN_PTR(resolveTypeInPool)},
{CC "resolveFieldInPool", CC "(" HS_CONSTANT_POOL "I" HS_RESOLVED_METHOD "B[I)" HS_RESOLVED_KLASS, FN_PTR(resolveFieldInPool)},

23
src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2019, 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
@ -127,9 +127,10 @@ public class KeyManagerFactory {
*
* @param algorithm the standard name of the requested algorithm.
* See the <a href=
* "{@docRoot}/../specs/security/standard-names.html">
* Java Security Standard Algorithm Names</a> document
* for information about standard algorithm names.
* "{@docRoot}/../specs/security/standard-names.html#keymanagerfactory-algorithms">
* KeyManagerFactory section</a> in the Java Security Standard
* Algorithm Names Specification for information about standard
* algorithm names.
*
* @return the new {@code KeyManagerFactory} object
*
@ -165,9 +166,10 @@ public class KeyManagerFactory {
* @param algorithm the standard name of the requested algorithm.
* See the <a href=
* "{@docRoot}/../specs/security/standard-names.html">
* Java Security Standard Algorithm Names</a> document
* for information about standard algorithm names.
* "{@docRoot}/../specs/security/standard-names.html#keymanagerfactory-algorithms">
* KeyManagerFactory section</a> in the Java Security Standard
* Algorithm Names Specification for information about standard
* algorithm names.
*
* @param provider the name of the provider.
*
@ -209,9 +211,10 @@ public class KeyManagerFactory {
*
* @param algorithm the standard name of the requested algorithm.
* See the <a href=
* "{@docRoot}/../specs/security/standard-names.html">
* Java Security Standard Algorithm Names</a> document
* for information about standard algorithm names.
* "{@docRoot}/../specs/security/standard-names.html#keymanagerfactory-algorithms">
* KeyManagerFactory section</a> in the Java Security Standard
* Algorithm Names Specification for information about standard
* algorithm names.
*
* @param provider an instance of the provider.
*

23
src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2019, 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
@ -141,9 +141,10 @@ public class TrustManagerFactory {
*
* @param algorithm the standard name of the requested trust management
* algorithm. See the <a href=
* "{@docRoot}/../specs/security/standard-names.html">
* Java Security Standard Algorithm Names</a> document
* for information about standard algorithm names.
* "{@docRoot}/../specs/security/standard-names.html#trustmanagerfactory-algorithms">
* TrustManagerFactory section</a> in the Java Security Standard
* Algorithm Names Specification for information about standard
* algorithm names.
*
* @return the new {@code TrustManagerFactory} object
*
@ -179,9 +180,10 @@ public class TrustManagerFactory {
*
* @param algorithm the standard name of the requested trust management
* algorithm. See the <a href=
* "{@docRoot}/../specs/security/standard-names.html">
* Java Security Standard Algorithm Names</a> document
* for information about standard algorithm names.
* "{@docRoot}/../specs/security/standard-names.html#trustmanagerfactory-algorithms">
* TrustManagerFactory section</a> in the Java Security Standard
* Algorithm Names Specification for information about standard
* algorithm names.
*
* @param provider the name of the provider.
*
@ -223,9 +225,10 @@ public class TrustManagerFactory {
*
* @param algorithm the standard name of the requested trust management
* algorithm. See the <a href=
* "{@docRoot}/../specs/security/standard-names.html">
* Java Security Standard Algorithm Names</a> document
* for information about standard algorithm names.
* "{@docRoot}/../specs/security/standard-names.html#trustmanagerfactory-algorithms">
* TrustManagerFactory section</a> in the Java Security Standard
* Algorithm Names Specification for information about standard
* algorithm names.
*
* @param provider an instance of the provider.
*

186
src/java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html

@ -2,10 +2,10 @@
<html lang="en">
<head>
<meta charset="utf-8"/>
<title>Nimbus colors</title>
<title>Colors Used in Nimbus Look and Feel</title>
</head>
<!--
Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2005, 2019, 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,212 +31,208 @@
<body>
<main role="main">
<h1 id="primaryColors">Primary Colors</h1>
<h1>Colors Used in Nimbus Look and Feel</h1>
<h2 id="primaryColors">Primary Colors</h2>
<table>
<caption>Primary colors used in Nimbus Look And Feel</caption>
<caption style="display:none">Primary colors used in Nimbus Look And Feel
</caption>
<thead>
<tr><th>Key</th><th>Value</th><th>Preview</th></tr>
<tr>
<th scope="col">Key</th>
<th scope="col">Value</th>
<th scope="col">Preview</th>
</tr>
</thead>
<tbody>
<tbody style="text-align:left">
<tr>
<td width="250"><code>control</code></td>
<th scope="row" width="250"><code>control</code></th>
<td><pre>#d6d9df (214,217,223)</pre></td>
<td width="100" bgcolor="#d6d9df">&nbsp;</td>
<td width="100" bgcolor="#d6d9df" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>info</code></td>
<th scope="row" width="250"><code>info</code></th>
<td><pre>#f2f2bd (242,242,189)</pre></td>
<td width="100" bgcolor="#f2f2bd">&nbsp;</td>
<td width="100" bgcolor="#f2f2bd" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>nimbusAlertYellow</code></td>
<th scope="row" width="250"><code>nimbusAlertYellow</code></th>
<td><pre>#ffdc23 (255,220,35)</pre></td>
<td width="100" bgcolor="#ffdc23">&nbsp;</td>
<td width="100" bgcolor="#ffdc23" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>nimbusBase</code></td>
<th scope="row" width="250"><code>nimbusBase</code></th>
<td><pre>#33628c (51,98,140)</pre></td>
<td width="100" bgcolor="#33628c">&nbsp;</td>
<td width="100" bgcolor="#33628c" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>nimbusDisabledText</code></td>
<th scope="row" width="250"><code>nimbusDisabledText</code></th>
<td><pre>#8e8f91 (142,143,145)</pre></td>
<td width="100" bgcolor="#8e8f91">&nbsp;</td>
<td width="100" bgcolor="#8e8f91" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>nimbusFocus</code></td>
<th scope="row" width="250"><code>nimbusFocus</code></th>
<td><pre>#73a4d1 (115,164,209)</pre></td>
<td width="100" bgcolor="#73a4d1">&nbsp;</td>
<td width="100" bgcolor="#73a4d1" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>nimbusGreen</code></td>
<th scope="row" width="250"><code>nimbusGreen</code></th>
<td><pre>#b0b332 (176,179,50)</pre></td>
<td width="100" bgcolor="#b0b332">&nbsp;</td>
<td width="100" bgcolor="#b0b332" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>nimbusInfoBlue</code></td>
<th scope="row" width="250"><code>nimbusInfoBlue</code></th>
<td><pre>#2f5cb4 (47,92,180)</pre></td>
<td width="100" bgcolor="#2f5cb4">&nbsp;</td>
<td width="100" bgcolor="#2f5cb4" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>nimbusLightBackground</code></td>
<th scope="row" width="250"><code>nimbusLightBackground</code></th>
<td><pre>#ffffff (255,255,255)</pre></td>
<td width="100" bgcolor="#ffffff">&nbsp;</td>
<td width="100" bgcolor="#ffffff" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>nimbusOrange</code></td>
<th scope="row" width="250"><code>nimbusOrange</code></th>
<td><pre>#bf6204 (191,98,4)</pre></td>
<td width="100" bgcolor="#bf6204">&nbsp;</td>
<td width="100" bgcolor="#bf6204" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>nimbusRed</code></td>
<th scope="row" width="250"><code>nimbusRed</code></th>
<td><pre>#a92e22 (169,46,34)</pre></td>
<td width="100" bgcolor="#a92e22">&nbsp;</td>
<td width="100" bgcolor="#a92e22" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>nimbusSelectedText</code></td>
<th scope="row" width="250"><code>nimbusSelectedText</code></th>
<td><pre>#ffffff (255,255,255)</pre></td>
<td width="100" bgcolor="#ffffff">&nbsp;</td>
<td width="100" bgcolor="#ffffff" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>nimbusSelectionBackground</code></td>
<th scope="row" width="250"><code>nimbusSelectionBackground</code></th>
<td><pre>#39698a (57,105,138)</pre></td>
<td width="100" bgcolor="#39698a">&nbsp;</td>
<td width="100" bgcolor="#39698a" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>text</code></td>
<th scope="row" width="250"><code>text</code></th>
<td><pre>#000000 (0,0,0)</pre></td>
<td width="100" bgcolor="#000000">&nbsp;</td>
<td width="100" bgcolor="#000000" aria-label="Color preview">&nbsp;</td>
</tr>
</tbody>
</table>
<h1 id="secondaryColors">Secondary Colors</h1>
<h2 id="secondaryColors">Secondary Colors</h2>
<table>
<caption>Secondary colors used in Nimbus Look And Feel </caption>
<caption style="display:none">Secondary colors used in Nimbus Look And Feel
</caption>
<thead>
<tr><th>Key</th><th>Value</th><th>Preview</th></tr>
<tr>
<th scope="col">Key</th>
<th scope="col">Value</th>
<th scope="col">Preview</th>
</tr>
</thead>
<tbody>
<tbody style="text-align:left">
<tr>
<td width="250"><code>activeCaption</code></td>
<th scope="row" width="250"><code>activeCaption</code></th>
<td><pre>#babec6 (186,190,198)</pre></td>
<td width="100" bgcolor="#babec6">&nbsp;</td>
<td width="100" bgcolor="#babec6" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>background</code></td>
<th scope="row" width="250"><code>background</code></th>
<td><pre>#d6d9df (214,217,223)</pre></td>
<td width="100" bgcolor="#d6d9df">&nbsp;</td>
<td width="100" bgcolor="#d6d9df" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>controlDkShadow</code></td>
<th scope="row" width="250"><code>controlDkShadow</code></th>
<td><pre>#a4abb8 (164,171,184)</pre></td>
<td width="100" bgcolor="#a4abb8">&nbsp;</td>
<td width="100" bgcolor="#a4abb8" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>controlHighlight</code></td>
<th scope="row" width="250"><code>controlHighlight</code></th>
<td><pre>#e9ecf2 (233,236,242)</pre></td>
<td width="100" bgcolor="#e9ecf2">&nbsp;</td>
<td width="100" bgcolor="#e9ecf2" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>controlLHighlight</code></td>
<th scope="row" width="250"><code>controlLHighlight</code></th>
<td><pre>#f7f8fa (247,248,250)</pre></td>
<td width="100" bgcolor="#f7f8fa">&nbsp;</td>
<td width="100" bgcolor="#f7f8fa" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>controlShadow</code></td>
<th scope="row" width="250"><code>controlShadow</code></th>
<td><pre>#ccd3e0 (204,211,224)</pre></td>
<td width="100" bgcolor="#ccd3e0">&nbsp;</td>
<td width="100" bgcolor="#ccd3e0" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>controlText</code></td>
<th scope="row" width="250"><code>controlText</code></th>
<td><pre>#000000 (0,0,0)</pre></td>
<td width="100" bgcolor="#000000">&nbsp;</td>
<td width="100" bgcolor="#000000" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>desktop</code></td>
<th scope="row" width="250"><code>desktop</code></th>
<td><pre>#3d6079 (61,96,121)</pre></td>
<td width="100" bgcolor="#3d6079">&nbsp;</td>
<td width="100" bgcolor="#3d6079" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>inactiveCaption</code></td>
<th scope="row" width="250"><code>inactiveCaption</code></th>
<td><pre>#bdc1c8 (189,193,200)</pre></td>
<td width="100" bgcolor="#bdc1c8">&nbsp;</td>
<td width="100" bgcolor="#bdc1c8" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>infoText</code></td>
<th scope="row" width="250"><code>infoText</code></th>
<td><pre>#000000 (0,0,0)</pre></td>
<td width="100" bgcolor="#000000">&nbsp;</td>
<td width="100" bgcolor="#000000" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>menu</code></td>
<th scope="row" width="250"><code>menu</code></th>
<td><pre>#edeff2 (237,239,242)</pre></td>
<td width="100" bgcolor="#edeff2">&nbsp;</td>
<td width="100" bgcolor="#edeff2" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>menuText</code></td>
<th scope="row" width="250"><code>menuText</code></th>
<td><pre>#000000 (0,0,0)</pre></td>
<td width="100" bgcolor="#000000">&nbsp;</td>
<td width="100" bgcolor="#000000" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>nimbusBlueGrey</code></td>
<th scope="row" width="250"><code>nimbusBlueGrey</code></th>
<td><pre>#a9b0be (169,176,190)</pre></td>
<td width="100" bgcolor="#a9b0be">&nbsp;</td>
<td width="100" bgcolor="#a9b0be" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>nimbusBorder</code></td>
<th scope="row" width="250"><code>nimbusBorder</code></th>
<td><pre>#9297a1 (146,151,161)</pre></td>
<td width="100" bgcolor="#9297a1">&nbsp;</td>
<td width="100" bgcolor="#9297a1" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>nimbusSelection</code></td>
<th scope="row" width="250"><code>nimbusSelection</code></th>
<td><pre>#39698a (57,105,138)</pre></td>
<td width="100" bgcolor="#39698a">&nbsp;</td>
<td width="100" bgcolor="#39698a" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>scrollbar</code></td>
<th scope="row" width="250"><code>scrollbar</code></th>
<td><pre>#cdd0d5 (205,208,213)</pre></td>
<td width="100" bgcolor="#cdd0d5">&nbsp;</td>
<td width="100" bgcolor="#cdd0d5" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>textBackground</code></td>
<th scope="row" width="250"><code>textBackground</code></th>
<td><pre>#39698a (57,105,138)</pre></td>
<td width="100" bgcolor="#39698a">&nbsp;</td>
<td width="100" bgcolor="#39698a" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>textForeground</code></td>
<th scope="row" width="250"><code>textForeground</code></th>
<td><pre>#000000 (0,0,0)</pre></td>
<td width="100" bgcolor="#000000">&nbsp;</td>
<td width="100" bgcolor="#000000" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>textHighlight</code></td>
<th scope="row" width="250"><code>textHighlight</code></th>
<td><pre>#39698a (57,105,138)</pre></td>
<td width="100" bgcolor="#39698a">&nbsp;</td>
<td width="100" bgcolor="#39698a" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>textHighlightText</code></td>
<th scope="row" width="250"><code>textHighlightText</code></th>
<td><pre>#ffffff (255,255,255)</pre></td>
<td width="100" bgcolor="#ffffff">&nbsp;</td>
<td width="100" bgcolor="#ffffff" aria-label="Color preview">&nbsp;</td>
</tr>
<tr>
<td width="250"><code>textInactiveText</code></td>
<th scope="row" width="250"><code>textInactiveText</code></th>
<td><pre>#8e8f91 (142,143,145)</pre></td>
<td width="100" bgcolor="#8e8f91">&nbsp;</td>
<td width="100" bgcolor="#8e8f91" aria-label="Color preview">&nbsp;</td>
</tr>
</tbody>
</table>

15
src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java

@ -210,21 +210,14 @@ final class CompilerToVM {
native HotSpotResolvedJavaType lookupClass(Class<?> javaClass);
/**
* Resolves the entry at index {@code cpi} in {@code constantPool} to an object.
*
* The behavior of this method is undefined if {@code cpi} does not denote one of the following
* entry types: {@code JVM_CONSTANT_MethodHandle}, {@code JVM_CONSTANT_MethodHandleInError},
* {@code JVM_CONSTANT_MethodType} and {@code JVM_CONSTANT_MethodTypeInError}.
*/
native HotSpotObjectConstantImpl resolveConstantInPool(HotSpotConstantPool constantPool, int cpi);
/**
* Resolves the entry at index {@code cpi} in {@code constantPool} to an object, looking in the
* constant pool cache first.
*
* The behavior of this method is undefined if {@code cpi} does not denote a
* {@code JVM_CONSTANT_String} entry.
* The behavior of this method is undefined if {@code cpi} does not denote one of the following
* entry types: {@code JVM_CONSTANT_String}, {@code JVM_CONSTANT_MethodHandle},
* {@code JVM_CONSTANT_MethodHandleInError}, {@code JVM_CONSTANT_MethodType} and
* {@code JVM_CONSTANT_MethodTypeInError}.
*/
native HotSpotObjectConstantImpl resolvePossiblyCachedConstantInPool(HotSpotConstantPool constantPool, int cpi);

2
src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java

@ -545,7 +545,7 @@ public final class HotSpotConstantPool implements ConstantPool, MetaspaceHandleO
case "MethodHandleInError":
case "MethodType":
case "MethodTypeInError":
return compilerToVM().resolveConstantInPool(this, cpi);
return compilerToVM().resolvePossiblyCachedConstantInPool(this, cpi);
default:
throw new JVMCIError("Unknown constant pool tag %s", tag);
}

5
test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java

@ -101,11 +101,6 @@ public class CompilerToVMHelper {
}
}
public static Object resolveConstantInPool(ConstantPool constantPool, int cpi) {
DirectHotSpotObjectConstantImpl obj = (DirectHotSpotObjectConstantImpl) CTVM.resolveConstantInPool((HotSpotConstantPool) constantPool, cpi);
return obj.object;
}
public static Object resolvePossiblyCachedConstantInPool(ConstantPool constantPool, int cpi) {
DirectHotSpotObjectConstantImpl obj = (DirectHotSpotObjectConstantImpl) CTVM.resolvePossiblyCachedConstantInPool((HotSpotConstantPool) constantPool, cpi);
return obj.object;

122
test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java

@ -1,122 +0,0 @@
/*
* Copyright (c) 2015, 2019, 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 8136421
* @requires vm.jvmci
* @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.access
* java.base/jdk.internal.reflect
* java.base/jdk.internal.org.objectweb.asm
* jdk.internal.vm.ci/jdk.vm.ci.hotspot
* jdk.internal.vm.ci/jdk.vm.ci.runtime
* jdk.internal.vm.ci/jdk.vm.ci.meta
*
* @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.ResolveConstantInPoolTest
*/
package compiler.jvmci.compilerToVM;
import compiler.jvmci.compilerToVM.ConstantPoolTestCase.ConstantTypes;
import compiler.jvmci.compilerToVM.ConstantPoolTestCase.Validator;
import compiler.jvmci.compilerToVM.ConstantPoolTestsHelper.DummyClasses;
import jdk.test.lib.Asserts;
import jdk.vm.ci.hotspot.CompilerToVMHelper;
import jdk.vm.ci.meta.ConstantPool;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodType;
import java.util.HashMap;
import java.util.Map;
import static compiler.jvmci.compilerToVM.ConstantPoolTestCase.ConstantTypes.CONSTANT_METHODHANDLE;
import static compiler.jvmci.compilerToVM.ConstantPoolTestCase.ConstantTypes.CONSTANT_METHODTYPE;
/**
* Test for {@code jdk.vm.ci.hotspot.CompilerToVM.resolveConstantInPool} method
*/
public class ResolveConstantInPoolTest {
private static final String NOT_NULL_MSG
= "Object returned by resolveConstantInPool method should not be null";
public static void main(String[] args) throws Exception {
Map<ConstantTypes, Validator> typeTests = new HashMap<>();
typeTests.put(CONSTANT_METHODHANDLE, ResolveConstantInPoolTest::validateMethodHandle);
typeTests.put(CONSTANT_METHODTYPE, ResolveConstantInPoolTest::validateMethodType);
ConstantPoolTestCase testCase = new ConstantPoolTestCase(typeTests);
testCase.test();
// The next "Class.forName" and repeating "testCase.test()"
// are here for the following reason.
// The first test run is without dummy class initialization,
// which means no constant pool cache exists.
// The second run is with initialized class (with constant pool cache available).
// Some CompilerToVM methods require different input
// depending on whether CP cache exists or not.
for (DummyClasses dummy : DummyClasses.values()) {
Class.forName(dummy.klass.getName());
}
testCase.test();
}
private static void validateMethodHandle(ConstantPool constantPoolCTVM,
ConstantTypes cpType,
DummyClasses dummyClass,
int index) {
Object constantInPool = CompilerToVMHelper.resolveConstantInPool(constantPoolCTVM, index);
String msg = String.format("%s for index %d", NOT_NULL_MSG, index);
Asserts.assertNotNull(constantInPool, msg);
if (!(constantInPool instanceof MethodHandle)) {
msg = String.format("Wrong constant pool entry accessed by index"
+ " %d: %s, but should be subclass of %s",
index,
constantInPool.getClass(),
MethodHandle.class.getName());
throw new AssertionError(msg);
}
}
private static void validateMethodType(ConstantPool constantPoolCTVM,
ConstantTypes cpType,
DummyClasses dummyClass,
int index) {
Object constantInPool = CompilerToVMHelper.resolveConstantInPool(constantPoolCTVM, index);
String msg = String.format("%s for index %d", NOT_NULL_MSG, index);
Asserts.assertNotNull(constantInPool, msg);
Class mtToVerify = constantInPool.getClass();
Class mtToRefer = MethodType.class;
msg = String.format("Wrong method type class accessed by"
+ " constant pool index %d",
index);
Asserts.assertEQ(mtToRefer, mtToVerify, msg);
}
}

54
test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java

@ -24,6 +24,7 @@
/*
* @test
* @bug 8138708
* @bug 8136421
* @requires vm.jvmci
* @library /test/lib /
* @library ../common/patches
@ -54,9 +55,13 @@ import jdk.test.lib.Asserts;
import jdk.vm.ci.hotspot.CompilerToVMHelper;
import jdk.vm.ci.meta.ConstantPool;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodType;
import java.util.HashMap;
import java.util.Map;
import static compiler.jvmci.compilerToVM.ConstantPoolTestCase.ConstantTypes.CONSTANT_METHODHANDLE;
import static compiler.jvmci.compilerToVM.ConstantPoolTestCase.ConstantTypes.CONSTANT_METHODTYPE;
import static compiler.jvmci.compilerToVM.ConstantPoolTestCase.ConstantTypes.CONSTANT_STRING;
/**
@ -67,10 +72,17 @@ public class ResolvePossiblyCachedConstantInPoolTest {
public static void main(String[] args) throws Exception {
Map<ConstantTypes, Validator> typeTests = new HashMap<>();
typeTests.put(CONSTANT_STRING, ResolvePossiblyCachedConstantInPoolTest::validateString);
typeTests.put(CONSTANT_METHODHANDLE, ResolvePossiblyCachedConstantInPoolTest::validateMethodHandle);
typeTests.put(CONSTANT_METHODTYPE, ResolvePossiblyCachedConstantInPoolTest::validateMethodType);
ConstantPoolTestCase testCase = new ConstantPoolTestCase(typeTests);
// The next "Class.forName" is here for the following reason.
// When class is initialized, constant pool cache is available.
// This method works only with cached constant pool.
testCase.test();
// The next "Class.forName" and repeating "testCase.test()"
// are here for the following reason.
// The first test run is without dummy class initialization,
// which means no constant pool cache exists.
// The second run is with initialized class (with constant pool cache available).
// Some CompilerToVM methods require different input
// depending on whether CP cache exists or not.
for (DummyClasses dummy : DummyClasses.values()) {
Class.forName(dummy.klass.getName());
}
@ -101,4 +113,40 @@ public class ResolvePossiblyCachedConstantInPoolTest {
String msg = String.format("Wrong string accessed by %sconstant pool index %d", cached, index);
Asserts.assertEQ(stringToRefer, stringToVerify, msg);
}
private static final String NOT_NULL_MSG
= "Object returned by resolvePossiblyCachedConstantInPool method should not be null";
private static void validateMethodHandle(ConstantPool constantPoolCTVM,
ConstantTypes cpType,
DummyClasses dummyClass,
int index) {
Object constantInPool = CompilerToVMHelper.resolvePossiblyCachedConstantInPool(constantPoolCTVM, index);
String msg = String.format("%s for index %d", NOT_NULL_MSG, index);
Asserts.assertNotNull(constantInPool, msg);
if (!(constantInPool instanceof MethodHandle)) {
msg = String.format("Wrong constant pool entry accessed by index"
+ " %d: %s, but should be subclass of %s",
index,
constantInPool.getClass(),
MethodHandle.class.getName());
throw new AssertionError(msg);
}
}
private static void validateMethodType(ConstantPool constantPoolCTVM,
ConstantTypes cpType,
DummyClasses dummyClass,
int index) {
Object constantInPool = CompilerToVMHelper.resolvePossiblyCachedConstantInPool(constantPoolCTVM, index);
String msg = String.format("%s for index %d", NOT_NULL_MSG, index);
Asserts.assertNotNull(constantInPool, msg);
Class mtToVerify = constantInPool.getClass();
Class mtToRefer = MethodType.class;
msg = String.format("Wrong method type class accessed by"
+ " constant pool index %d",
index);
Asserts.assertEQ(mtToRefer, mtToVerify, msg);
}
}

177
test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2019, 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,86 +28,7 @@ import java.io.PrintStream;
import nsk.share.*;
import nsk.share.jvmti.*;
// THIS TEST IS LINE NUMBER SENSITIVE
public class tc02t001 extends DebugeeClass {
// run test from command line
public static void main(String argv[]) {
argv = nsk.share.jvmti.JVMTITest.commonInit(argv);
// JCK-compatible exit
System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
}
// run test from JCK-compatible environment
public static int run(String argv[], PrintStream out) {
return new tc02t001().runIt(argv, out);
}
/* =================================================================== */
// scaffold objects
ArgumentHandler argHandler = null;
Log log = null;
int status = Consts.TEST_PASSED;
static long timeout = 0;
// tested thread
tc02t001Thread thread = null;
// run debuggee
public int runIt(String argv[], PrintStream out) {
argHandler = new ArgumentHandler(argv);
log = new Log(out, argHandler);
timeout = argHandler.getWaitTime() * 60 * 1000;
log.display("Timeout = " + timeout + " msc.");
thread = new tc02t001Thread("Debuggee Thread");
synchronized (thread.M) {
thread.start();
thread.startingBarrier.waitFor();
status = checkStatus(status);
thread.waitingBarrier1.unlock();
try {
Thread.sleep(1000); // Wait for contended "synchronized (M)"
thread.M.wait(timeout);
} catch (InterruptedException e) {
throw new Failure(e);
}
thread.waitingBarrier2.unlock();
try {
Thread.sleep(1000); // Wait for contended "synchronized (M)"
thread.M.wait(timeout);
} catch (InterruptedException e) {
throw new Failure(e);
}
thread.waitingBarrier3.unlock();
try {
Thread.sleep(1000); // Wait for contended "synchronized (M)"
thread.M.wait(timeout);
} catch (InterruptedException e) {
throw new Failure(e);
}
}
try {
thread.join(timeout);
} catch (InterruptedException e) {
throw new Failure(e);
}
log.display("Debugee finished");
status = checkStatus(status);
return status;
}
}
/* =================================================================== */
// THIS CLASS IS LINE NUMBER SENSITIVE
class tc02t001Thread extends Thread {
public Wicket startingBarrier = new Wicket();
@ -139,3 +60,97 @@ class tc02t001Thread extends Thread {
}
}
}
/* =================================================================== */
public class tc02t001 extends DebugeeClass {
// run test from command line
public static void main(String argv[]) {
argv = nsk.share.jvmti.JVMTITest.commonInit(argv);
// JCK-compatible exit
System.exit(run(argv, System.out) + Consts.JCK_STATUS_BASE);
}
// run test from JCK-compatible environment
public static int run(String argv[], PrintStream out) {
return new tc02t001().runIt(argv, out);
}
/* =================================================================== */
// scaffold objects
ArgumentHandler argHandler = null;
Log log = null;
int status = Consts.TEST_PASSED;
static long timeout = 0;
private static volatile int lastEnterEventsCount;
private static native int enterEventsCount();
// tested thread
tc02t001Thread thread = null;
static void log (String msg) { System.out.println(msg); }
private void waitForContendedEnterEvent() {
try {
for (int j = 0; j < (timeout / 20); j++) {
Thread.sleep(20);
if (enterEventsCount() > lastEnterEventsCount) {
log("Got expected MonitorContendedEnter event\n");
break;
}
}
if (enterEventsCount() == lastEnterEventsCount) {
String msg = "Timeout in waiting for a MonitorContendedEnter event";
throw new RuntimeException(msg);
}
thread.M.wait(timeout);
} catch (InterruptedException e) {
throw new Failure(e);
}
}
// run debuggee
public int runIt(String argv[], PrintStream out) {
argHandler = new ArgumentHandler(argv);
log = new Log(out, argHandler);
timeout = argHandler.getWaitTime() * 60 * 1000;
log.display("Timeout = " + timeout + " msc.");
thread = new tc02t001Thread("Debuggee Thread");
synchronized (thread.M) {
thread.start();
thread.startingBarrier.waitFor();
status = checkStatus(status);
lastEnterEventsCount = enterEventsCount();
thread.waitingBarrier1.unlock();
log("Waiting for MonitorEnterEvent #1");
waitForContendedEnterEvent();
lastEnterEventsCount = enterEventsCount();
thread.waitingBarrier2.unlock();
log("Waiting for MonitorEnterEvent #2");
waitForContendedEnterEvent();
lastEnterEventsCount = enterEventsCount();
thread.waitingBarrier3.unlock();
log("Waiting for MonitorEnterEvent #3");
waitForContendedEnterEvent();
}
try {
thread.join(timeout);
} catch (InterruptedException e) {
throw new Failure(e);
}
log.display("Debugee finished");
status = checkStatus(status);
return status;
}
}

9
test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001/tc02t001.cpp

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2019, 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,7 @@ static jlong timeout = 0;
static jthread thread = NULL;
static jobject object_M = NULL;
/* line numbers of "synchronized (M)" clauses in java part of the test */
static jint lines[] = { 127, 132, 137 };
static jint lines[] = { 48, 53, 58 };
static volatile int enterEventsCount = 0;
static volatile int enteredEventsCount = 0;
@ -370,6 +370,11 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
return JNI_OK;
}
JNIEXPORT jint JNICALL
Java_nsk_jvmti_scenarios_contention_TC02_tc02t001_enterEventsCount(JNIEnv* jni, jclass klass) {
return enterEventsCount;
}
/* ========================================================================== */
}

36
test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC04/tc04t001.java

@ -86,23 +86,6 @@ public class tc04t001 extends DebugeeClass {
", expected: " + THREADS_LIMIT*tc04t001Thread.INCREMENT_LIMIT);
status = Consts.TEST_FAILED;
}
/* DEBUG -- to check if the threads taking turns in right order
boolean race = false;
for (int i = 1; i < 2*tc04t001Thread.INCREMENT_LIMIT; i++) {
if (tc04t001Thread.passOrder[i] == tc04t001Thread.passOrder[i-1]) {
race = true;
System.out.println("Race condition in the test:");
System.out.println("passOrder[" + (i-1) + "]:"
+ tc04t001Thread.passOrder[i-1]);
System.out.println("passOrder[" + (i) + "]:"
+ tc04t001Thread.passOrder[i]);
}
}
if (race)
System.out.println("There was a race condition in the test.");
*/
return status;
}
}
@ -117,11 +100,6 @@ class tc04t001Thread extends Thread {
static volatile int value = 0;
static Flicker flicker = new Flicker();
/* DEBUG -- to check if the threads taking turns in right order
static volatile int iter = 0;
static volatile int passOrder[] =
new int[INCREMENT_LIMIT*tc04t001.THREADS_LIMIT];
*/
private int id;
private static volatile int lastEnterEventsCount;
@ -135,7 +113,6 @@ class tc04t001Thread extends Thread {
public synchronized void run() {
for (int i = 0; i < INCREMENT_LIMIT; i++) {
flicker.waitFor(id);
lastEnterEventsCount = enterEventsCount();
increment(id);
try {
wait(1);
@ -145,11 +122,9 @@ class tc04t001Thread extends Thread {
}
static synchronized void increment(int i) {
/* DEBUG -- to check if the threads taking turns in right order
passOrder[iter++] = i;
*/
flicker.unlock(i);
int temp = value;
boolean done = false;
// Wait in a loop for a MonitorContendedEnter event.
// Timeout is: 20ms * DELAY.
@ -158,17 +133,22 @@ class tc04t001Thread extends Thread {
sleep(20);
} catch (InterruptedException e) {}
done = (tc04t001.threadsDoneSignal.getCount() == 1);
if (done) {
break; // This thread is the only remaining thread, no more contention
}
if (enterEventsCount() > lastEnterEventsCount) {
System.out.println("Thread-" + i + ": increment event: " + enterEventsCount());
break; // Got an expected MonitorContendedEnter event
}
}
System.out.println("Thread-" + i + ": increment event: " + enterEventsCount());
if (enterEventsCount() == lastEnterEventsCount) {
if (!done && enterEventsCount() == lastEnterEventsCount) {
String msg = "Timeout in waiting for a MonitorContendedEnter event";
throw new RuntimeException(msg);
}
value = temp + 1;
lastEnterEventsCount = enterEventsCount();
}
}

4
test/jdk/ProblemList.txt

@ -875,7 +875,3 @@ jdk/jfr/event/io/EvilInstrument.java 8221331 gener
############################################################################
# jdk/internal/docker
jdk/internal/platform/docker/TestDockerMemoryMetrics.java 8224506 generic-all
jdk/internal/platform/docker/TestSystemMetrics.java 8224502 generic-all

4
test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2019, 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
@ -63,7 +63,7 @@ public class TestDockerMemoryMetrics {
testOomKillFlag("100m", false);
testOomKillFlag("100m", true);
testMemoryFailCount("20m");
testMemoryFailCount("64m");
testMemorySoftLimit("500m","200m");

3
test/jdk/jdk/internal/platform/docker/TestSystemMetrics.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2019, 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
@ -51,6 +51,7 @@ public class TestSystemMetrics {
DockerRunOptions opts =
new DockerRunOptions(imageName, "/jdk/bin/java", "jdk.test.lib.containers.cgroup.MetricsTester");
opts.addDockerOpts("--volume", Utils.TEST_CLASSES + ":/test-classes/");
opts.addDockerOpts("--memory=256m");
opts.addJavaOpts("-cp", "/test-classes/");
opts.addJavaOpts("--add-exports", "java.base/jdk.internal.platform=ALL-UNNAMED");
DockerTestUtils.dockerRunJava(opts).shouldHaveExitValue(0).shouldContain("TEST PASSED!!!");

2
test/lib/jdk/test/lib/containers/cgroup/MetricsTester.java

@ -560,7 +560,7 @@ public class MetricsTester {
long memoryMaxUsage = metrics.getMemoryMaxUsage();
long memoryUsage = metrics.getMemoryUsage();
long[] ll = new long[64*1024*1024]; // 64M
byte[] bb = new byte[64*1024*1024]; // 64M
long newMemoryMaxUsage = metrics.getMemoryMaxUsage();
long newMemoryUsage = metrics.getMemoryUsage();