# HG changeset patch
# User psadhukhan
# Date 1569403119 -19800
# Node ID de8e08015d51c3463e6e2755a1e97dcd5955f29f
# Parent  483f14c3e0a2a1de72d69adb951f8230c9898507# Parent  8a2bc12d2a9a0ab48c03a7fcf4844dffd715fcfe
Merge

diff -r 483f14c3e0a2 -r de8e08015d51 test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java
--- a/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java	Wed Sep 25 13:40:36 2019 +0530
+++ b/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java	Wed Sep 25 14:48:39 2019 +0530
@@ -49,8 +49,9 @@
         System.out.println("\nC1 invocation tests, Tests: " + whichTests +
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(false, "-Xmx128M",
-            "-Xcomp", "-XX:TieredStopAtLevel=1", whichTests,
-            "--classfile_version=" + classFileVersion);
+            "-Xcomp", "-XX:TieredStopAtLevel=1",
+            "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
+            whichTests, "--classfile_version=" + classFileVersion);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         try {
             output.shouldContain("EXECUTION STATUS: PASSED");
diff -r 483f14c3e0a2 -r de8e08015d51 test/hotspot/jtreg/runtime/InvocationTests/invocationGraalTests.java
--- a/test/hotspot/jtreg/runtime/InvocationTests/invocationGraalTests.java	Wed Sep 25 13:40:36 2019 +0530
+++ b/test/hotspot/jtreg/runtime/InvocationTests/invocationGraalTests.java	Wed Sep 25 14:48:39 2019 +0530
@@ -51,6 +51,7 @@
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(false, "-Xmx128M",
             "-XX:+UnlockExperimentalVMOptions", "-XX:+EnableJVMCI", "-XX:+UseJVMCICompiler",
+            "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
             whichTests, "--classfile_version=" + classFileVersion);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         try {
diff -r 483f14c3e0a2 -r de8e08015d51 test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java
--- a/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java	Wed Sep 25 13:40:36 2019 +0530
+++ b/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java	Wed Sep 25 14:48:39 2019 +0530
@@ -48,6 +48,7 @@
         System.out.println("\ninvokeinterface invocation tests, option: " + option +
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(false, "-Xmx128M", option,
+            "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
             "invokeinterface.Generator", "--classfile_version=" + classFileVersion);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         try {
diff -r 483f14c3e0a2 -r de8e08015d51 test/hotspot/jtreg/runtime/InvocationTests/invokespecialTests.java
--- a/test/hotspot/jtreg/runtime/InvocationTests/invokespecialTests.java	Wed Sep 25 13:40:36 2019 +0530
+++ b/test/hotspot/jtreg/runtime/InvocationTests/invokespecialTests.java	Wed Sep 25 14:48:39 2019 +0530
@@ -47,6 +47,7 @@
         System.out.println("\ninvokespecial invocation tests, option: " + option +
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(false, "-Xmx128M", option,
+            "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
             "invokespecial.Generator", "--classfile_version=" + classFileVersion);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         try {
diff -r 483f14c3e0a2 -r de8e08015d51 test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java
--- a/test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java	Wed Sep 25 13:40:36 2019 +0530
+++ b/test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java	Wed Sep 25 14:48:39 2019 +0530
@@ -47,6 +47,7 @@
         System.out.println("\ninvokevirtual invocation tests, option: " + option +
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(false, "-Xmx128M", option,
+            "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
             "invokevirtual.Generator", "--classfile_version=" + classFileVersion);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         try {
diff -r 483f14c3e0a2 -r de8e08015d51 test/hotspot/jtreg/runtime/Unsafe/InternalErrorTest.java
--- a/test/hotspot/jtreg/runtime/Unsafe/InternalErrorTest.java	Wed Sep 25 13:40:36 2019 +0530
+++ b/test/hotspot/jtreg/runtime/Unsafe/InternalErrorTest.java	Wed Sep 25 14:48:39 2019 +0530
@@ -28,6 +28,7 @@
  * @summary Check that SIGBUS errors caused by memory accesses in Unsafe_CopyMemory()
  * and UnsafeCopySwapMemory() get converted to java.lang.InternalError exceptions.
  * @modules java.base/jdk.internal.misc
+ *          java.base/java.nio:+open
  *
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
diff -r 483f14c3e0a2 -r de8e08015d51 test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.java
--- a/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.java	Wed Sep 25 13:40:36 2019 +0530
+++ b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.java	Wed Sep 25 14:48:39 2019 +0530
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2003, 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