8286551: JDK-8286460 causes tests to fail to compile in Tier2

Backport-of: 070a0cda31f83a3cf18a612b91c30d66cf407c3c

test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/CDSMHTest_generate.sh

@@ -31,7 +31,7 @@ do
     fname="$i$name_suffix"
     cat << EOF > $fname
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, 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,7 @@ do
 import org.junit.Test;
 
 import java.io.File;
+import java.nio.file.Path;
 import jdk.test.lib.Platform;
 
 public class $i extends DynamicArchiveTestBase {

test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesAsCollectorTest.java

@@ -47,6 +47,7 @@
 import org.junit.Test;
 
 import java.io.File;
+import java.nio.file.Path;
 import jdk.test.lib.Platform;
 
 public class MethodHandlesAsCollectorTest extends DynamicArchiveTestBase {

test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesCastFailureTest.java

@@ -47,6 +47,7 @@
 import org.junit.Test;
 
 import java.io.File;
+import java.nio.file.Path;
 import jdk.test.lib.Platform;
 
 public class MethodHandlesCastFailureTest extends DynamicArchiveTestBase {

test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesGeneralTest.java

@@ -47,6 +47,7 @@
 import org.junit.Test;
 
 import java.io.File;
+import java.nio.file.Path;
 import jdk.test.lib.Platform;
 
 public class MethodHandlesGeneralTest extends DynamicArchiveTestBase {

test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesInvokersTest.java

@@ -47,6 +47,7 @@
 import org.junit.Test;
 
 import java.io.File;
+import java.nio.file.Path;
 import jdk.test.lib.Platform;
 
 public class MethodHandlesInvokersTest extends DynamicArchiveTestBase {

test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesPermuteArgumentsTest.java

@@ -47,6 +47,7 @@
 import org.junit.Test;
 
 import java.io.File;
+import java.nio.file.Path;
 import jdk.test.lib.Platform;
 
 public class MethodHandlesPermuteArgumentsTest extends DynamicArchiveTestBase {

test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesSpreadArgumentsTest.java

@@ -47,6 +47,7 @@
 import org.junit.Test;
 
 import java.io.File;
+import java.nio.file.Path;
 import jdk.test.lib.Platform;
 
 public class MethodHandlesSpreadArgumentsTest extends DynamicArchiveTestBase {

test/hotspot/jtreg/runtime/cds/appcds/methodHandles/CDSMHTest_generate.sh

@@ -31,7 +31,7 @@ do
     fname="$i$name_suffix"
     cat << EOF > $fname
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, 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
@@ -78,6 +78,7 @@ do
 import org.junit.Test;
 
 import java.io.File;
+import java.nio.file.Path;
 
 import jdk.test.lib.cds.CDSOptions;
 import jdk.test.lib.cds.CDSTestUtils;

test/hotspot/jtreg/runtime/cds/appcds/methodHandles/MethodHandlesAsCollectorTest.java

@@ -46,6 +46,7 @@
 import org.junit.Test;
 
 import java.io.File;
+import java.nio.file.Path;
 
 import jdk.test.lib.cds.CDSOptions;
 import jdk.test.lib.cds.CDSTestUtils;

test/hotspot/jtreg/runtime/cds/appcds/methodHandles/MethodHandlesCastFailureTest.java

@@ -46,6 +46,7 @@
 import org.junit.Test;
 
 import java.io.File;
+import java.nio.file.Path;
 
 import jdk.test.lib.cds.CDSOptions;
 import jdk.test.lib.cds.CDSTestUtils;

test/hotspot/jtreg/runtime/cds/appcds/methodHandles/MethodHandlesGeneralTest.java

@@ -46,6 +46,7 @@
 import org.junit.Test;
 
 import java.io.File;
+import java.nio.file.Path;
 
 import jdk.test.lib.cds.CDSOptions;
 import jdk.test.lib.cds.CDSTestUtils;

test/hotspot/jtreg/runtime/cds/appcds/methodHandles/MethodHandlesInvokersTest.java

@@ -46,6 +46,7 @@
 import org.junit.Test;
 
 import java.io.File;
+import java.nio.file.Path;
 
 import jdk.test.lib.cds.CDSOptions;
 import jdk.test.lib.cds.CDSTestUtils;

test/hotspot/jtreg/runtime/cds/appcds/methodHandles/MethodHandlesPermuteArgumentsTest.java

@@ -46,6 +46,7 @@
 import org.junit.Test;
 
 import java.io.File;
+import java.nio.file.Path;
 
 import jdk.test.lib.cds.CDSOptions;
 import jdk.test.lib.cds.CDSTestUtils;

test/hotspot/jtreg/runtime/cds/appcds/methodHandles/MethodHandlesSpreadArgumentsTest.java

@@ -46,6 +46,7 @@
 import org.junit.Test;
 
 import java.io.File;
+import java.nio.file.Path;
 
 import jdk.test.lib.cds.CDSOptions;
 import jdk.test.lib.cds.CDSTestUtils;