diff --git a/make/Coverage.gmk b/make/Coverage.gmk index 503acbe03ab..c6c82af2401 100644 --- a/make/Coverage.gmk +++ b/make/Coverage.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018, 2025, 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,7 +47,6 @@ $(JCOV_IMAGE_DIR)/release: $(JCOV_INPUT_IMAGE_DIR)/release -t $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)/template.xml \ -rt $(JCOV_HOME)/lib/jcov_network_saver.jar \ -exclude 'java.lang.Object' \ - -exclude 'jdk.internal.org.objectweb.**' \ -exclude jdk.test.Main -exclude '**\$Proxy*' \ $(JCOV_FILTERS) \ $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR) diff --git a/test/hotspot/jtreg/compiler/c1/Test6932496.java b/test/hotspot/jtreg/compiler/c1/Test6932496.java index 84628f0037d..e1214fa2aff 100644 --- a/test/hotspot/jtreg/compiler/c1/Test6932496.java +++ b/test/hotspot/jtreg/compiler/c1/Test6932496.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2025, 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,7 +25,7 @@ * @test * @bug 6932496 * @summary incorrect deopt of jsr subroutine on 64 bit c1 - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * * @run main/othervm -Xcomp * -XX:CompileCommand=compileonly,compiler.c1.Test6932496::test @@ -34,12 +34,12 @@ package compiler.c1; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.FieldVisitor; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; import java.io.IOException; import java.lang.reflect.Method; diff --git a/test/hotspot/jtreg/compiler/calls/common/InvokeDynamicPatcher.java b/test/hotspot/jtreg/compiler/calls/common/InvokeDynamicPatcher.java index f38c949adff..b82e06317d2 100644 --- a/test/hotspot/jtreg/compiler/calls/common/InvokeDynamicPatcher.java +++ b/test/hotspot/jtreg/compiler/calls/common/InvokeDynamicPatcher.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ package compiler.calls.common; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Handle; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; import java.io.FileInputStream; import java.io.IOException; diff --git a/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeDynamic2CompiledTest.java b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeDynamic2CompiledTest.java index 836b398008b..914500a25d4 100644 --- a/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeDynamic2CompiledTest.java +++ b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeDynamic2CompiledTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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,8 +25,8 @@ * @test * @summary check calls from compiled to compiled using InvokeDynamic * @library /test/lib / + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * java.base/jdk.internal.org.objectweb.asm * * @build jdk.test.whitebox.WhiteBox * @run driver compiler.calls.common.InvokeDynamicPatcher diff --git a/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeDynamic2InterpretedTest.java b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeDynamic2InterpretedTest.java index 71067217580..b6f8520a90a 100644 --- a/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeDynamic2InterpretedTest.java +++ b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeDynamic2InterpretedTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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,8 +25,8 @@ * @test * @summary check calls from compiled to interpreted using InvokeDynamic * @library /test/lib / + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * java.base/jdk.internal.org.objectweb.asm * * @build jdk.test.whitebox.WhiteBox * @run driver compiler.calls.common.InvokeDynamicPatcher diff --git a/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeDynamic2NativeTest.java b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeDynamic2NativeTest.java index 24399d2f046..e334f6a15f0 100644 --- a/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeDynamic2NativeTest.java +++ b/test/hotspot/jtreg/compiler/calls/fromCompiled/CompiledInvokeDynamic2NativeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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,8 +25,8 @@ * @test * @summary check calls from compiled to native using InvokeDynamic * @library /test/lib / + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * java.base/jdk.internal.org.objectweb.asm * * @build jdk.test.whitebox.WhiteBox * @run driver compiler.calls.common.InvokeDynamicPatcher diff --git a/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2CompiledTest.java b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2CompiledTest.java index 1721823e04f..ca626fd3b01 100644 --- a/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2CompiledTest.java +++ b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2CompiledTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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,8 +25,8 @@ * @test * @summary check calls from interpreted to compiled using InvokeDynamic * @library /test/lib / + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * java.base/jdk.internal.org.objectweb.asm * * @build jdk.test.whitebox.WhiteBox * @run driver compiler.calls.common.InvokeDynamicPatcher diff --git a/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2InterpretedTest.java b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2InterpretedTest.java index c987f6ba27a..d8d877977d4 100644 --- a/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2InterpretedTest.java +++ b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2InterpretedTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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,8 +25,8 @@ * @test * @summary check calls from interpreted to interpreted using InvokeDynamic * @library /test/lib / + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * java.base/jdk.internal.org.objectweb.asm * * @build jdk.test.whitebox.WhiteBox * @run driver compiler.calls.common.InvokeDynamicPatcher diff --git a/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2NativeTest.java b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2NativeTest.java index 3bdabe6f436..38bca4939d4 100644 --- a/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2NativeTest.java +++ b/test/hotspot/jtreg/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2NativeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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,8 +25,8 @@ * @test * @summary check calls from interpreted to native using InvokeDynamic * @library /test/lib / + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * java.base/jdk.internal.org.objectweb.asm * * @build jdk.test.whitebox.WhiteBox * @run driver compiler.calls.common.InvokeDynamicPatcher diff --git a/test/hotspot/jtreg/compiler/cha/AbstractRootMethod.java b/test/hotspot/jtreg/compiler/cha/AbstractRootMethod.java index 53865d34898..4aa5eeffff9 100644 --- a/test/hotspot/jtreg/compiler/cha/AbstractRootMethod.java +++ b/test/hotspot/jtreg/compiler/cha/AbstractRootMethod.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2025, 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,9 @@ /* * @test * @requires !vm.graal.enabled - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @modules java.base/jdk.internal.misc * java.base/jdk.internal.vm.annotation + * @library /testlibrary/asm * @library /test/lib / * @compile Utils.java * @build jdk.test.whitebox.WhiteBox diff --git a/test/hotspot/jtreg/compiler/cha/DefaultRootMethod.java b/test/hotspot/jtreg/compiler/cha/DefaultRootMethod.java index b2074d49052..37ac89f6975 100644 --- a/test/hotspot/jtreg/compiler/cha/DefaultRootMethod.java +++ b/test/hotspot/jtreg/compiler/cha/DefaultRootMethod.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2025, 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,9 @@ /* * @test * @requires !vm.graal.enabled - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @modules java.base/jdk.internal.misc * java.base/jdk.internal.vm.annotation + * @library /testlibrary/asm * @library /test/lib / * @compile Utils.java * @build jdk.test.whitebox.WhiteBox diff --git a/test/hotspot/jtreg/compiler/cha/StrengthReduceInterfaceCall.java b/test/hotspot/jtreg/compiler/cha/StrengthReduceInterfaceCall.java index 6008b6bb593..aa014cfa63d 100644 --- a/test/hotspot/jtreg/compiler/cha/StrengthReduceInterfaceCall.java +++ b/test/hotspot/jtreg/compiler/cha/StrengthReduceInterfaceCall.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2025, 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,9 +25,9 @@ * @test * @requires !vm.graal.enabled * @requires vm.opt.StressUnstableIfTraps == null | !vm.opt.StressUnstableIfTraps - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @modules java.base/jdk.internal.misc * java.base/jdk.internal.vm.annotation + * @library /testlibrary/asm * @library /test/lib / * @compile Utils.java * @build jdk.test.whitebox.WhiteBox diff --git a/test/hotspot/jtreg/compiler/cha/Utils.java b/test/hotspot/jtreg/compiler/cha/Utils.java index 1bdee572a9d..0e0a9bfbecc 100644 --- a/test/hotspot/jtreg/compiler/cha/Utils.java +++ b/test/hotspot/jtreg/compiler/cha/Utils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2025, 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,8 @@ package compiler.cha; import jdk.internal.misc.Unsafe; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; import jdk.internal.vm.annotation.DontInline; import jdk.test.whitebox.WhiteBox; import jdk.test.whitebox.code.NMethod; @@ -39,9 +39,9 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.concurrent.Callable; -import static jdk.internal.org.objectweb.asm.ClassWriter.COMPUTE_FRAMES; -import static jdk.internal.org.objectweb.asm.ClassWriter.COMPUTE_MAXS; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.ClassWriter.COMPUTE_FRAMES; +import static org.objectweb.asm.ClassWriter.COMPUTE_MAXS; +import static org.objectweb.asm.Opcodes.*; import static jdk.test.lib.Asserts.assertTrue; public class Utils { diff --git a/test/hotspot/jtreg/compiler/jsr292/CallSiteDepContextTest.java b/test/hotspot/jtreg/compiler/jsr292/CallSiteDepContextTest.java index f49affbb935..3063c4e0f87 100644 --- a/test/hotspot/jtreg/compiler/jsr292/CallSiteDepContextTest.java +++ b/test/hotspot/jtreg/compiler/jsr292/CallSiteDepContextTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ * @bug 8057967 * @requires vm.opt.final.ClassUnloading * @modules java.base/jdk.internal.misc - * java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @library patches / * * @build java.base/java.lang.invoke.MethodHandleHelper @@ -38,9 +38,9 @@ package compiler.jsr292; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Handle; +import org.objectweb.asm.MethodVisitor; import java.lang.invoke.CallSite; import java.lang.invoke.MethodHandle; @@ -54,11 +54,11 @@ import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; import java.lang.reflect.Field; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER; -import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESTATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.IRETURN; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_STATIC; +import static org.objectweb.asm.Opcodes.ACC_SUPER; +import static org.objectweb.asm.Opcodes.H_INVOKESTATIC; +import static org.objectweb.asm.Opcodes.IRETURN; public class CallSiteDepContextTest { static final MethodHandles.Lookup LOOKUP = MethodHandleHelper.IMPL_LOOKUP; diff --git a/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/RedefineTest.java b/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/RedefineTest.java index 1592e01f3ca..56e832a5afb 100644 --- a/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/RedefineTest.java +++ b/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/RedefineTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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,9 @@ /* * @test * @bug 8072008 - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @modules java.base/jdk.internal.misc * java.base/jdk.internal.vm.annotation + * @library /testlibrary/asm * @library /test/lib / ../patches * @requires vm.jvmti * @@ -47,8 +47,8 @@ package compiler.jsr292.NonInlinedCall; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; import jdk.internal.vm.annotation.DontInline; import jdk.test.whitebox.WhiteBox; @@ -59,10 +59,10 @@ import java.lang.invoke.MethodHandleHelper; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER; -import static jdk.internal.org.objectweb.asm.Opcodes.IRETURN; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_STATIC; +import static org.objectweb.asm.Opcodes.ACC_SUPER; +import static org.objectweb.asm.Opcodes.IRETURN; public class RedefineTest { static final MethodHandles.Lookup LOOKUP = MethodHandleHelper.IMPL_LOOKUP; diff --git a/test/hotspot/jtreg/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java b/test/hotspot/jtreg/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java index 61d03ad22a8..93f21164bf5 100644 --- a/test/hotspot/jtreg/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java +++ b/test/hotspot/jtreg/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, 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,8 +26,8 @@ * @bug 8042235 * @summary redefining method used by multiple MethodHandles crashes VM * @library / - * @modules java.base/jdk.internal.org.objectweb.asm - * java.compiler + * @library /testlibrary/asm + * @modules java.compiler * java.instrument * jdk.attach * @requires vm.jvmti @@ -37,11 +37,11 @@ package compiler.jsr292; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; import java.io.FileOutputStream; import java.io.IOException; diff --git a/test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java b/test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java index b6dc8c3f5b1..9a7d010f5b7 100644 --- a/test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java +++ b/test/hotspot/jtreg/compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2025, 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,7 +25,7 @@ * @test * @bug 8025260 8016839 8046171 * @summary Ensure that correct exceptions are thrown, not NullPointerException - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @library / . * * @build p.* @@ -48,28 +48,28 @@ package compiler.jsr292.methodHandleExceptions; import p.Dok; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Handle; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PRIVATE; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER; -import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.ILOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKEVIRTUAL; -import static jdk.internal.org.objectweb.asm.Opcodes.IRETURN; -import static jdk.internal.org.objectweb.asm.Opcodes.LLOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.RETURN; -import static jdk.internal.org.objectweb.asm.Opcodes.V1_8; +import static org.objectweb.asm.Opcodes.ACC_PRIVATE; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_STATIC; +import static org.objectweb.asm.Opcodes.ACC_SUPER; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ILOAD; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; +import static org.objectweb.asm.Opcodes.IRETURN; +import static org.objectweb.asm.Opcodes.LLOAD; +import static org.objectweb.asm.Opcodes.RETURN; +import static org.objectweb.asm.Opcodes.V1_8; public class TestAMEnotNPE { diff --git a/test/hotspot/jtreg/compiler/jvmci/common/CTVMUtilities.java b/test/hotspot/jtreg/compiler/jvmci/common/CTVMUtilities.java index 9263f444d07..95917f6d943 100644 --- a/test/hotspot/jtreg/compiler/jvmci/common/CTVMUtilities.java +++ b/test/hotspot/jtreg/compiler/jvmci/common/CTVMUtilities.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ package compiler.jvmci.common; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.tree.ClassNode; import jdk.test.lib.Utils; import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java index 8f41f6f0eef..a963d5e196d 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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,10 +28,9 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/AsResolvedJavaMethodTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/AsResolvedJavaMethodTest.java index 4112b744905..d79432fa5c6 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/AsResolvedJavaMethodTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/AsResolvedJavaMethodTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java index 44c9b9e7f57..da6642bdc18 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -29,7 +29,7 @@ import compiler.jvmci.common.testcases.MultipleImplementersInterface; import compiler.jvmci.compilerToVM.ConstantPoolTestCase.ConstantTypes; import compiler.jvmci.compilerToVM.ConstantPoolTestCase.TestedCPEntry; import jdk.internal.access.SharedSecrets; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.Opcodes; import jdk.internal.reflect.ConstantPool; import jdk.internal.reflect.ConstantPool.Tag; import jdk.vm.ci.hotspot.HotSpotConstantPool.Bytecodes; diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java index caea10cbc1a..0b0faca313d 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.code + * @modules jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java index da7e1082e3a..8e98eb23c2f 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java index 7cd1aedffa0..bf34372ef0f 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,11 +27,10 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @ignore 8249621 * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java index e382725374f..a9d730694b0 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci * @library / /test/lib * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetBytecodeTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetBytecodeTest.java index 69deb0f0909..0404cd03a04 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetBytecodeTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetBytecodeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime @@ -45,7 +44,7 @@ package compiler.jvmci.compilerToVM; import compiler.jvmci.common.CTVMUtilities; import compiler.jvmci.common.testcases.TestCase; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.Opcodes; import jdk.test.lib.Asserts; import jdk.vm.ci.hotspot.CompilerToVMHelper; import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetConstantPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetConstantPoolTest.java index 4d100bb3035..f02b2871d94 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetConstantPoolTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetConstantPoolTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,11 +27,10 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @ignore 8249621 * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.code * diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetExceptionTableTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetExceptionTableTest.java index 1002d0b74f5..0e0a5ee6e2c 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetExceptionTableTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetExceptionTableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java index 3fad653d583..e1fcd1aadac 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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,10 +28,9 @@ * @library /test/lib / * @library ../common/patches * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java index 401a882550c..83b6618d555 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java index dfd7554dfe9..7b78753b01b 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetSymbolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetSymbolTest.java index 01aa5845a70..7fc3235b88c 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetSymbolTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetSymbolTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,9 +27,8 @@ * @requires vm.jvmci * @library / /test/lib * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc:+open - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot:+open * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java index 1db9c79621f..1fb4ea723ee 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci * @library / /test/lib * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java index 866c576b193..af25f731ed1 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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,10 +28,9 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/HasNeverInlineDirectiveTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/HasNeverInlineDirectiveTest.java index 49c3e8dcaa6..c8836b674d8 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/HasNeverInlineDirectiveTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/HasNeverInlineDirectiveTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsCompilableTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsCompilableTest.java index fdcf72f6548..93b987f0d9e 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsCompilableTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsCompilableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.graal.enabled & vm.compMode == "Xmixed" * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime @@ -48,10 +47,9 @@ * @requires vm.jvmci & vm.compMode == "Xmixed" * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsMatureVsReprofileTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsMatureVsReprofileTest.java index ecd055e6bc1..7d84380b859 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsMatureVsReprofileTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsMatureVsReprofileTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, 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 @@ -27,9 +27,8 @@ * @requires vm.jvmci & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4) * @library / /test/lib * ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree * jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IterateFramesNative.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IterateFramesNative.java index 0b5ee1e88fa..7f2a3900dc6 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IterateFramesNative.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IterateFramesNative.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2025, 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 @@ -29,10 +29,9 @@ * * @library / /test/lib * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.code.stack * jdk.internal.vm.ci/jdk.vm.ci.meta diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupConstantInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupConstantInPoolTest.java index ac366626730..d7590710dba 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupConstantInPoolTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupConstantInPoolTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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,10 +28,9 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.access * java.base/jdk.internal.reflect - * java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree * jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.runtime * jdk.internal.vm.ci/jdk.vm.ci.meta diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java index 337ca60ee53..8549c274b9b 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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,10 +28,9 @@ * @summary Testing compiler.jvmci.CompilerToVM.lookupKlassInPool method * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.access * java.base/jdk.internal.reflect - * java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree * jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.runtime * jdk.internal.vm.ci/jdk.vm.ci.meta diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupKlassRefIndexInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupKlassRefIndexInPoolTest.java index b1d0c06410c..f1c590700a1 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupKlassRefIndexInPoolTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupKlassRefIndexInPoolTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.access * java.base/jdk.internal.reflect - * java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree * jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.runtime * jdk.internal.vm.ci/jdk.vm.ci.meta diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupMethodInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupMethodInPoolTest.java index 176ec3d9d56..9054aa91c22 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupMethodInPoolTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupMethodInPoolTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.access * java.base/jdk.internal.reflect - * java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree * jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupNameAndTypeRefIndexInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupNameAndTypeRefIndexInPoolTest.java index bd196012452..0605a4659b8 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupNameAndTypeRefIndexInPoolTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupNameAndTypeRefIndexInPoolTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.access * java.base/jdk.internal.reflect - * java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree * jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.runtime * jdk.internal.vm.ci/jdk.vm.ci.meta diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupNameInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupNameInPoolTest.java index 3d64b26f3f6..b054444acea 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupNameInPoolTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupNameInPoolTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.access * java.base/jdk.internal.reflect - * java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree * jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.runtime * jdk.internal.vm.ci/jdk.vm.ci.meta diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupSignatureInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupSignatureInPoolTest.java index 1ae0acb40aa..5dc33ee3d08 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupSignatureInPoolTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupSignatureInPoolTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.access * java.base/jdk.internal.reflect - * java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree * jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.runtime * jdk.internal.vm.ci/jdk.vm.ci.meta diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java index 6830769b652..b6b818f5739 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -34,10 +34,9 @@ * * @library / /test/lib * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.code.stack * jdk.internal.vm.ci/jdk.vm.ci.meta diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java index b406f8a1ed5..17000b7fa01 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.reflect - * java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree * jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ReprofileTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ReprofileTest.java index e7be6ef262b..9e8beec3395 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ReprofileTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ReprofileTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4) * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta * diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java index cfec9c1d184..ab693c0e2d0 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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 @@ -27,11 +27,10 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.access * java.base/jdk.internal.misc * java.base/jdk.internal.reflect - * java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree * jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime @@ -51,7 +50,7 @@ import compiler.jvmci.compilerToVM.ConstantPoolTestCase.TestedCPEntry; import compiler.jvmci.compilerToVM.ConstantPoolTestCase.Validator; import compiler.jvmci.compilerToVM.ConstantPoolTestsHelper.DummyClasses; import jdk.internal.misc.Unsafe; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.Opcodes; import jdk.test.lib.Asserts; import jdk.vm.ci.hotspot.CompilerToVMHelper; import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveMethodTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveMethodTest.java index 0d976bf7a6c..33bb73af331 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveMethodTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveMethodTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci * @library / /test/lib * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java index c1251056d98..6acd555ea84 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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,9 +28,9 @@ * @summary Testing compiler.jvmci.CompilerToVM.resolveTypeInPool method * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @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 diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java index cffb55ab208..77f0d534220 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,10 +27,9 @@ * @requires vm.jvmci * @library /test/lib / * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree - * jdk.internal.vm.ci/jdk.vm.ci.hotspot + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime diff --git a/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java b/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java index 2fa6cf5582c..6230dda8802 100644 --- a/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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 @@ -27,9 +27,8 @@ * @requires vm.jvmci & !vm.graal.enabled & vm.compMode == "Xmixed" & vm.opt.TieredStopAtLevel == null * @library / /test/lib * @library ../common/patches + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.org.objectweb.asm.tree * jdk.internal.vm.ci/jdk.vm.ci.hotspot * jdk.internal.vm.ci/jdk.vm.ci.code * jdk.internal.vm.ci/jdk.vm.ci.meta diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestDynamicConstant.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestDynamicConstant.java index ba3a0aaafe8..b22cb01d81a 100644 --- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestDynamicConstant.java +++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestDynamicConstant.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2025, 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,8 +25,8 @@ * @test * @requires vm.jvmci * @summary Test CONSTANT_Dynamic resolution by HotSpotConstantPool. - * @modules java.base/jdk.internal.org.objectweb.asm - * jdk.internal.vm.ci/jdk.vm.ci.hotspot:+open + * @library /testlibrary/asm + * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot:+open * jdk.internal.vm.ci/jdk.vm.ci.runtime * jdk.internal.vm.ci/jdk.vm.ci.meta * @run testng/othervm @@ -54,12 +54,12 @@ import java.util.Set; import org.testng.Assert; import org.testng.annotations.Test; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.ConstantDynamic; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.ConstantDynamic; +import org.objectweb.asm.Handle; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; import jdk.vm.ci.hotspot.HotSpotObjectConstant; import jdk.vm.ci.hotspot.HotSpotConstantPool; import jdk.vm.ci.meta.ConstantPool; diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java index 7e16e6b3fcb..04f3f0b2787 100644 --- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java +++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2025, 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,14 +25,14 @@ * @test * @requires vm.jvmci * @library ../../../../../ + * @library /testlibrary/asm * @compile ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/AnnotationTestInput.java * ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/MemberDeleted.java * ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/MemberTypeChanged.java * @clean jdk.internal.vm.test.AnnotationTestInput$Missing * @compile ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/alt/MemberDeleted.java * ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/alt/MemberTypeChanged.java - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.reflect + * @modules java.base/jdk.internal.reflect * jdk.internal.vm.ci/jdk.vm.ci.meta * jdk.internal.vm.ci/jdk.vm.ci.runtime * jdk.internal.vm.ci/jdk.vm.ci.common diff --git a/test/hotspot/jtreg/compiler/osr/TestOSRWithNonEmptyStack.java b/test/hotspot/jtreg/compiler/osr/TestOSRWithNonEmptyStack.java index 3cbcbb02d1b..db7e7f249d7 100644 --- a/test/hotspot/jtreg/compiler/osr/TestOSRWithNonEmptyStack.java +++ b/test/hotspot/jtreg/compiler/osr/TestOSRWithNonEmptyStack.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, 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,32 +25,32 @@ * @test * @bug 8051344 * @summary Force OSR compilation with non-empty stack at the OSR entry point. - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @run main/othervm -XX:CompileCommand=compileonly,TestCase::test * compiler.osr.TestOSRWithNonEmptyStack */ package compiler.osr; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; import java.lang.reflect.Constructor; import java.lang.reflect.Method; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.DUP; -import static jdk.internal.org.objectweb.asm.Opcodes.IADD; -import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_0; -import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_1; -import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPLT; -import static jdk.internal.org.objectweb.asm.Opcodes.ILOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL; -import static jdk.internal.org.objectweb.asm.Opcodes.ISTORE; -import static jdk.internal.org.objectweb.asm.Opcodes.POP; -import static jdk.internal.org.objectweb.asm.Opcodes.RETURN; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.DUP; +import static org.objectweb.asm.Opcodes.IADD; +import static org.objectweb.asm.Opcodes.ICONST_0; +import static org.objectweb.asm.Opcodes.ICONST_1; +import static org.objectweb.asm.Opcodes.IF_ICMPLT; +import static org.objectweb.asm.Opcodes.ILOAD; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.ISTORE; +import static org.objectweb.asm.Opcodes.POP; +import static org.objectweb.asm.Opcodes.RETURN; public class TestOSRWithNonEmptyStack extends ClassLoader { private static final int CLASS_FILE_VERSION = 52; diff --git a/test/hotspot/jtreg/compiler/runtime/TestConstantDynamic.java b/test/hotspot/jtreg/compiler/runtime/TestConstantDynamic.java index 06604c5b981..9f79735f60e 100644 --- a/test/hotspot/jtreg/compiler/runtime/TestConstantDynamic.java +++ b/test/hotspot/jtreg/compiler/runtime/TestConstantDynamic.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025, 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,7 +25,7 @@ * @test * @bug 8280473 * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * * @run main/othervm -XX:+TieredCompilation -XX:TieredStopAtLevel=1 * -Xbatch -XX:CompileThreshold=100 -XX:CompileCommand=compileonly,*::test @@ -39,7 +39,7 @@ package compiler.runtime; -import jdk.internal.org.objectweb.asm.*; +import org.objectweb.asm.*; import java.io.FileOutputStream; import java.io.IOException; @@ -51,8 +51,8 @@ import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; import java.lang.reflect.Method; -import static jdk.internal.org.objectweb.asm.ClassWriter.*; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.ClassWriter.*; +import static org.objectweb.asm.Opcodes.*; public class TestConstantDynamic { static final Class THIS_CLASS = TestConstantDynamic.class; diff --git a/test/hotspot/jtreg/compiler/runtime/TestConstantsInError.java b/test/hotspot/jtreg/compiler/runtime/TestConstantsInError.java index 46a34f64c09..3d11e74eabd 100644 --- a/test/hotspot/jtreg/compiler/runtime/TestConstantsInError.java +++ b/test/hotspot/jtreg/compiler/runtime/TestConstantsInError.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025, 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,13 +26,13 @@ * @bug 8279822 * @requires vm.flagless * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * * @run main compiler.runtime.TestConstantsInError */ package compiler.runtime; -import jdk.internal.org.objectweb.asm.*; +import org.objectweb.asm.*; import jdk.test.lib.Platform; import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.ProcessTools; @@ -46,8 +46,8 @@ import java.lang.invoke.MethodType; import java.util.ArrayList; import java.util.List; -import static jdk.internal.org.objectweb.asm.ClassWriter.*; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.ClassWriter.*; +import static org.objectweb.asm.Opcodes.*; interface OutputProcessor { default void process(OutputAnalyzer output, boolean isC1) {} @@ -248,7 +248,6 @@ public abstract class TestConstantsInError implements OutputProcessor { static void run(TestConstantsInError test) throws Exception { List commonArgs = List.of( - "--add-exports", "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED", "-Xbatch", "-XX:CompileThreshold=100", "-XX:CompileCommand=quiet", "-XX:CompileCommand=compileonly,*::test", "-XX:+PrintCompilation", diff --git a/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloaded.java b/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloaded.java index 8a1be961c80..dca83349d80 100644 --- a/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloaded.java +++ b/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloaded.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2025, 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 @@ -27,10 +27,17 @@ * @test * @bug 8322726 * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * * @compile TestMHUnloaded.java TestMHUnloadedHelper.java * @run driver jdk.test.lib.helpers.ClassFileInstaller compiler.runtime.unloaded.TestMHUnloadedHelper + * org.objectweb.asm.ClassWriter org.objectweb.asm.ClassVisitor + * org.objectweb.asm.SymbolTable org.objectweb.asm.SymbolTable$Entry + * org.objectweb.asm.Symbol org.objectweb.asm.ByteVector + * org.objectweb.asm.MethodWriter org.objectweb.asm.MethodVisitor + * org.objectweb.asm.Type org.objectweb.asm.Label + * org.objectweb.asm.Handler org.objectweb.asm.Attribute + * org.objectweb.asm.AnnotationWriter org.objectweb.asm.AnnotationVisitor * * @run main/othervm -Xbootclasspath/a:. * -Xbatch -XX:-TieredCompilation -XX:CompileCommand=exclude,*::test diff --git a/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloadedHelper.java b/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloadedHelper.java index 176945572e8..751b8c095ee 100644 --- a/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloadedHelper.java +++ b/test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloadedHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2025, 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 @@ -29,9 +29,9 @@ import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; import java.util.function.BiPredicate; -import jdk.internal.org.objectweb.asm.ClassWriter; +import org.objectweb.asm.ClassWriter; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; // Operates in bootstrap loader context. public class TestMHUnloadedHelper { diff --git a/test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java b/test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java index 3d8230dc353..d4f4649eb83 100644 --- a/test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java +++ b/test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java @@ -26,8 +26,8 @@ * @bug 8141551 * @summary C2 can not handle returns with inccompatible interface arrays * @requires vm.compMode == "Xmixed" & vm.flavor == "server" - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @modules java.base/jdk.internal.misc + * @library /testlibrary/asm * @library /test/lib / * * @build jdk.test.whitebox.WhiteBox @@ -82,28 +82,28 @@ package compiler.types; import compiler.whitebox.CompilerWhiteBoxTest; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; import jdk.test.whitebox.WhiteBox; import java.io.FileOutputStream; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import static jdk.internal.org.objectweb.asm.Opcodes.AALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.ARETURN; -import static jdk.internal.org.objectweb.asm.Opcodes.ASTORE; -import static jdk.internal.org.objectweb.asm.Opcodes.GETSTATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_0; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKEINTERFACE; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESTATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKEVIRTUAL; -import static jdk.internal.org.objectweb.asm.Opcodes.RETURN; -import static jdk.internal.org.objectweb.asm.Opcodes.V1_8; +import static org.objectweb.asm.Opcodes.AALOAD; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_STATIC; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ARETURN; +import static org.objectweb.asm.Opcodes.ASTORE; +import static org.objectweb.asm.Opcodes.GETSTATIC; +import static org.objectweb.asm.Opcodes.ICONST_0; +import static org.objectweb.asm.Opcodes.INVOKEINTERFACE; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.INVOKESTATIC; +import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; +import static org.objectweb.asm.Opcodes.RETURN; +import static org.objectweb.asm.Opcodes.V1_8; public class TestMeetIncompatibleInterfaceArrays extends ClassLoader { diff --git a/test/hotspot/jtreg/compiler/uncommontrap/TestUnstableIfTrap.java b/test/hotspot/jtreg/compiler/uncommontrap/TestUnstableIfTrap.java index 05b80eab2c0..04293370eb5 100644 --- a/test/hotspot/jtreg/compiler/uncommontrap/TestUnstableIfTrap.java +++ b/test/hotspot/jtreg/compiler/uncommontrap/TestUnstableIfTrap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, 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,8 +26,8 @@ * @bug 8030976 8059226 * @requires !vm.graal.enabled & (vm.opt.StressUnstableIfTraps == null | !vm.opt.StressUnstableIfTraps) * @library /test/lib / - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.internal.jvmstat/sun.jvmstat.monitor @@ -67,10 +67,10 @@ package compiler.uncommontrap; import compiler.testlibrary.uncommontrap.Verifier; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; import jdk.test.lib.ByteCodeLoader; import jdk.test.lib.Platform; import jdk.test.whitebox.WhiteBox; @@ -81,18 +81,18 @@ import java.io.IOException; import java.lang.reflect.Method; import java.util.Properties; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_ABSTRACT; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_VOLATILE; -import static jdk.internal.org.objectweb.asm.Opcodes.GETSTATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.GOTO; -import static jdk.internal.org.objectweb.asm.Opcodes.IADD; -import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_1; -import static jdk.internal.org.objectweb.asm.Opcodes.IFEQ; -import static jdk.internal.org.objectweb.asm.Opcodes.ILOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.ISUB; -import static jdk.internal.org.objectweb.asm.Opcodes.RETURN; +import static org.objectweb.asm.Opcodes.ACC_ABSTRACT; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_STATIC; +import static org.objectweb.asm.Opcodes.ACC_VOLATILE; +import static org.objectweb.asm.Opcodes.GETSTATIC; +import static org.objectweb.asm.Opcodes.GOTO; +import static org.objectweb.asm.Opcodes.IADD; +import static org.objectweb.asm.Opcodes.ICONST_1; +import static org.objectweb.asm.Opcodes.IFEQ; +import static org.objectweb.asm.Opcodes.ILOAD; +import static org.objectweb.asm.Opcodes.ISUB; +import static org.objectweb.asm.Opcodes.RETURN; public class TestUnstableIfTrap { private static final WhiteBox WB = WhiteBox.getWhiteBox(); diff --git a/test/hotspot/jtreg/compiler/unsafe/UnsafeGetConstantField.java b/test/hotspot/jtreg/compiler/unsafe/UnsafeGetConstantField.java index 51ad5b33ebf..8b20cbf8ecd 100644 --- a/test/hotspot/jtreg/compiler/unsafe/UnsafeGetConstantField.java +++ b/test/hotspot/jtreg/compiler/unsafe/UnsafeGetConstantField.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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,11 +25,11 @@ * @test * @summary tests on constant folding of unsafe get operations * @library /test/lib + * @library /testlibrary/asm * * @requires vm.flavor == "server" & !vm.emulatedClient * - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.vm.annotation + * @modules java.base/jdk.internal.vm.annotation * java.base/jdk.internal.misc * * @library ../jsr292/patches @@ -58,11 +58,11 @@ package compiler.unsafe; import jdk.internal.misc.Unsafe; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.FieldVisitor; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; import jdk.internal.vm.annotation.Stable; import jdk.test.lib.Asserts; import jdk.test.lib.Platform; @@ -75,22 +75,22 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_FINAL; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACONST_NULL; -import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.ARETURN; -import static jdk.internal.org.objectweb.asm.Opcodes.DUP; -import static jdk.internal.org.objectweb.asm.Opcodes.GETFIELD; -import static jdk.internal.org.objectweb.asm.Opcodes.GETSTATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESTATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKEVIRTUAL; -import static jdk.internal.org.objectweb.asm.Opcodes.NEW; -import static jdk.internal.org.objectweb.asm.Opcodes.PUTFIELD; -import static jdk.internal.org.objectweb.asm.Opcodes.PUTSTATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.RETURN; +import static org.objectweb.asm.Opcodes.ACC_FINAL; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_STATIC; +import static org.objectweb.asm.Opcodes.ACONST_NULL; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ARETURN; +import static org.objectweb.asm.Opcodes.DUP; +import static org.objectweb.asm.Opcodes.GETFIELD; +import static org.objectweb.asm.Opcodes.GETSTATIC; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.INVOKESTATIC; +import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; +import static org.objectweb.asm.Opcodes.NEW; +import static org.objectweb.asm.Opcodes.PUTFIELD; +import static org.objectweb.asm.Opcodes.PUTSTATIC; +import static org.objectweb.asm.Opcodes.RETURN; public class UnsafeGetConstantField { static final Class THIS_CLASS = UnsafeGetConstantField.class; diff --git a/test/hotspot/jtreg/gc/epsilon/TestClasses.java b/test/hotspot/jtreg/gc/epsilon/TestClasses.java index 53e1bab3f6f..5bda742a608 100644 --- a/test/hotspot/jtreg/gc/epsilon/TestClasses.java +++ b/test/hotspot/jtreg/gc/epsilon/TestClasses.java @@ -28,8 +28,8 @@ package gc.epsilon; * @requires vm.gc.Epsilon * @summary Epsilon is able to allocate a lot of classes, resizing Metaspace * - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * * @run main/othervm -Xmx256m * -XX:MetaspaceSize=1m -XX:MaxMetaspaceSize=64m -Xlog:gc -Xlog:gc+metaspace @@ -37,8 +37,8 @@ package gc.epsilon; * gc.epsilon.TestClasses */ -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Opcodes; public class TestClasses { diff --git a/test/hotspot/jtreg/runtime/AccModule/ACCModule52.java b/test/hotspot/jtreg/runtime/AccModule/ACCModule52.java index 3af0c146089..49a650be80f 100644 --- a/test/hotspot/jtreg/runtime/AccModule/ACCModule52.java +++ b/test/hotspot/jtreg/runtime/AccModule/ACCModule52.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, 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 @@ -21,7 +21,7 @@ * questions. */ -import jdk.internal.org.objectweb.asm.*; +import org.objectweb.asm.*; /* * @test @@ -29,7 +29,7 @@ import jdk.internal.org.objectweb.asm.*; * 52 class file. * @bug 8175383 * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @compile -XDignore.symbol.file ACCModule52.java * @run main ACCModule52 */ diff --git a/test/hotspot/jtreg/runtime/AccModule/ConstModule.java b/test/hotspot/jtreg/runtime/AccModule/ConstModule.java index bff5ec67e0a..d0f08f1b2b7 100644 --- a/test/hotspot/jtreg/runtime/AccModule/ConstModule.java +++ b/test/hotspot/jtreg/runtime/AccModule/ConstModule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, 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 @@ -21,7 +21,7 @@ * questions. */ -import jdk.internal.org.objectweb.asm.*; +import org.objectweb.asm.*; /* * @test @@ -30,7 +30,7 @@ import jdk.internal.org.objectweb.asm.*; * not set in the access_flags. * @bug 8175383 * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @compile -XDignore.symbol.file ConstModule.java * @run main ConstModule */ diff --git a/test/hotspot/jtreg/runtime/BootstrapMethod/BSMCalledTwice.java b/test/hotspot/jtreg/runtime/BootstrapMethod/BSMCalledTwice.java index fb00abb3d18..bcc7bc4b7c6 100644 --- a/test/hotspot/jtreg/runtime/BootstrapMethod/BSMCalledTwice.java +++ b/test/hotspot/jtreg/runtime/BootstrapMethod/BSMCalledTwice.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, 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,7 +25,7 @@ * @test * @bug 8174954 * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @compile -XDignore.symbol.file BSMCalledTwice.java * @run main BSMCalledTwice */ @@ -34,8 +34,8 @@ * @test * @bug 8262134 * @library /test/lib + * @library /testlibrary/asm * @requires vm.debug - * @modules java.base/jdk.internal.org.objectweb.asm * @compile -XDignore.symbol.file BSMCalledTwice.java * @run main/othervm -Xcomp -XX:CompileCommand=compileonly,TestC::* -XX:+DeoptimizeALot -XX:+VerifyStack BSMCalledTwice */ @@ -43,8 +43,8 @@ import java.io.File; import java.io.FileOutputStream; import java.util.*; -import static jdk.internal.org.objectweb.asm.Opcodes.*; -import jdk.internal.org.objectweb.asm.*; +import static org.objectweb.asm.Opcodes.*; +import org.objectweb.asm.*; import jdk.test.lib.process.ProcessTools; import jdk.test.lib.process.OutputAnalyzer; diff --git a/test/hotspot/jtreg/runtime/ClassFile/UnsupportedClassFileVersion.java b/test/hotspot/jtreg/runtime/ClassFile/UnsupportedClassFileVersion.java index c61f46c3ecd..3b0e0c41410 100644 --- a/test/hotspot/jtreg/runtime/ClassFile/UnsupportedClassFileVersion.java +++ b/test/hotspot/jtreg/runtime/ClassFile/UnsupportedClassFileVersion.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, 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,17 +24,17 @@ /* * @test * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * java.management * @run driver UnsupportedClassFileVersion */ import java.io.File; import java.io.FileOutputStream; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; import jdk.test.lib.process.ProcessTools; import jdk.test.lib.process.OutputAnalyzer; diff --git a/test/hotspot/jtreg/runtime/ConstantPool/BadMethodHandles.java b/test/hotspot/jtreg/runtime/ConstantPool/BadMethodHandles.java index 69766c1c1b7..894c8dc12d8 100644 --- a/test/hotspot/jtreg/runtime/ConstantPool/BadMethodHandles.java +++ b/test/hotspot/jtreg/runtime/ConstantPool/BadMethodHandles.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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,20 +25,20 @@ * @test * @bug 8087223 8195650 * @summary Adding constantTag to keep method call consistent with it. - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * java.management * @compile -XDignore.symbol.file BadMethodHandles.java * @run main/othervm BadMethodHandles */ -import jdk.internal.org.objectweb.asm.*; +import org.objectweb.asm.*; import java.io.FileOutputStream; import java.lang.reflect.InvocationTargetException; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; public class BadMethodHandles { diff --git a/test/hotspot/jtreg/runtime/ConstantPool/IntfMethod.java b/test/hotspot/jtreg/runtime/ConstantPool/IntfMethod.java index f0a1dacc977..742f27e5891 100644 --- a/test/hotspot/jtreg/runtime/ConstantPool/IntfMethod.java +++ b/test/hotspot/jtreg/runtime/ConstantPool/IntfMethod.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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,8 +25,8 @@ * @test * $bug 8087223 * @summary Adding constantTag to keep method call consistent with it. - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * java.management * @compile -XDignore.symbol.file IntfMethod.java * @run main/othervm IntfMethod @@ -35,10 +35,10 @@ */ -import jdk.internal.org.objectweb.asm.*; +import org.objectweb.asm.*; import java.io.FileOutputStream; import java.lang.reflect.InvocationTargetException; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; public class IntfMethod { static byte[] dumpC() { diff --git a/test/hotspot/jtreg/runtime/HiddenClasses/HiddenDefMeths.java b/test/hotspot/jtreg/runtime/HiddenClasses/HiddenDefMeths.java index ee3460988a5..895cea12a69 100644 --- a/test/hotspot/jtreg/runtime/HiddenClasses/HiddenDefMeths.java +++ b/test/hotspot/jtreg/runtime/HiddenClasses/HiddenDefMeths.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2025, 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,14 +25,14 @@ * @test * @summary Tests a hidden class that implements interfaces with default methods. * @library /testlibrary - * @modules java.base/jdk.internal.org.objectweb.asm - * java.management + * @library /testlibrary/asm + * @modules java.management * @run main HiddenDefMeths */ -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Type; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Type; import java.lang.invoke.MethodType; import java.lang.invoke.MethodHandles; @@ -43,17 +43,17 @@ import java.lang.reflect.Method; import java.util.stream.Collectors; import java.util.stream.Stream; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PRIVATE; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER; -import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.ARETURN; -import static jdk.internal.org.objectweb.asm.Opcodes.DUP; -import static jdk.internal.org.objectweb.asm.Opcodes.GETFIELD; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL; -import static jdk.internal.org.objectweb.asm.Opcodes.PUTFIELD; -import static jdk.internal.org.objectweb.asm.Opcodes.RETURN; -import static jdk.internal.org.objectweb.asm.Opcodes.V1_8; +import static org.objectweb.asm.Opcodes.ACC_PRIVATE; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_SUPER; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ARETURN; +import static org.objectweb.asm.Opcodes.DUP; +import static org.objectweb.asm.Opcodes.GETFIELD; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.PUTFIELD; +import static org.objectweb.asm.Opcodes.RETURN; +import static org.objectweb.asm.Opcodes.V1_8; public class HiddenDefMeths { diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java b/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java index 57df6306276..0e4f01bb55f 100644 --- a/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java +++ b/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2025, 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,8 +28,8 @@ * @summary Run invocation tests against C1 compiler * @requires vm.flagless * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * @compile invokespecial/Checker.java invokespecial/ClassGenerator.java invokespecial/Generator.java * * @run driver/timeout=1800 invocationC1Tests special @@ -41,8 +41,8 @@ * @summary Run invocation tests against C1 compiler * @requires vm.flagless * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * @compile invokevirtual/Checker.java invokevirtual/ClassGenerator.java invokevirtual/Generator.java * * @run driver/timeout=1800 invocationC1Tests virtual @@ -54,8 +54,8 @@ * @summary Run invocation tests against C1 compiler * @requires vm.flagless * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * @compile invokeinterface/Checker.java invokeinterface/ClassGenerator.java invokeinterface/Generator.java * * @run driver/timeout=1800 invocationC1Tests interface @@ -72,7 +72,6 @@ public class invocationC1Tests { ", class file version: " + classFileVersion); ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder("-Xmx128M", "-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 { diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invokeinterface/ClassGenerator.java b/test/hotspot/jtreg/runtime/InvocationTests/invokeinterface/ClassGenerator.java index 45a8ce79d2c..1bc644364d6 100644 --- a/test/hotspot/jtreg/runtime/InvocationTests/invokeinterface/ClassGenerator.java +++ b/test/hotspot/jtreg/runtime/InvocationTests/invokeinterface/ClassGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2025, 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 invokeinterface; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.Opcodes; import shared.GenericClassGenerator; /*******************************************************************/ diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invokeinterface/Generator.java b/test/hotspot/jtreg/runtime/InvocationTests/invokeinterface/Generator.java index 7e835e24a71..87ed51acf43 100644 --- a/test/hotspot/jtreg/runtime/InvocationTests/invokeinterface/Generator.java +++ b/test/hotspot/jtreg/runtime/InvocationTests/invokeinterface/Generator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2025, 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 @@ -70,7 +70,7 @@ package invokeinterface; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; import shared.AbstractGenerator; import shared.AccessType; import shared.Utils; diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java b/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java index 9b72899d138..1cf175030be 100644 --- a/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java +++ b/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2025, 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,8 +28,8 @@ * @summary Run invokeinterface invocation tests * @requires vm.flagless * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * @compile invokeinterface/Checker.java invokeinterface/ClassGenerator.java * invokeinterface/Generator.java * @@ -42,8 +42,8 @@ * @summary Run invokeinterface invocation tests * @requires vm.flagless * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * @compile invokeinterface/Checker.java invokeinterface/ClassGenerator.java * invokeinterface/Generator.java * @@ -56,8 +56,8 @@ * @summary Run invokeinterface invocation tests * @requires vm.flagless * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * @compile invokeinterface/Checker.java invokeinterface/ClassGenerator.java * invokeinterface/Generator.java * @@ -74,7 +74,6 @@ public class invokeinterfaceTests { System.out.println("\ninvokeinterface invocation tests, option: " + option + ", class file version: " + classFileVersion); ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder("-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 --git a/test/hotspot/jtreg/runtime/InvocationTests/invokespecial/ClassGenerator.java b/test/hotspot/jtreg/runtime/InvocationTests/invokespecial/ClassGenerator.java index 543d1bd5a8f..7836759cea0 100644 --- a/test/hotspot/jtreg/runtime/InvocationTests/invokespecial/ClassGenerator.java +++ b/test/hotspot/jtreg/runtime/InvocationTests/invokespecial/ClassGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2025, 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 invokespecial; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.Opcodes; import shared.GenericClassGenerator; /*******************************************************************/ diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invokespecial/Generator.java b/test/hotspot/jtreg/runtime/InvocationTests/invokespecial/Generator.java index c6a65dd3609..6b2c40bc429 100644 --- a/test/hotspot/jtreg/runtime/InvocationTests/invokespecial/Generator.java +++ b/test/hotspot/jtreg/runtime/InvocationTests/invokespecial/Generator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2025, 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 @@ -239,7 +239,7 @@ package invokespecial; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; import shared.AbstractGenerator; import shared.AccessType; diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invokespecialTests.java b/test/hotspot/jtreg/runtime/InvocationTests/invokespecialTests.java index 817e5da9616..f990b08b638 100644 --- a/test/hotspot/jtreg/runtime/InvocationTests/invokespecialTests.java +++ b/test/hotspot/jtreg/runtime/InvocationTests/invokespecialTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2025, 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,8 +28,8 @@ * @summary Run invokespecial invocation tests * @requires vm.flagless * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * @compile invokespecial/Checker.java invokespecial/ClassGenerator.java invokespecial/Generator.java * * @run driver/timeout=1800 invokespecialTests current-int @@ -41,8 +41,8 @@ * @summary Run invokespecial invocation tests * @requires vm.flagless * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * @compile invokespecial/Checker.java invokespecial/ClassGenerator.java invokespecial/Generator.java * * @run driver/timeout=1800 invokespecialTests current-comp @@ -54,8 +54,8 @@ * @summary Run invokespecial invocation tests * @requires vm.flagless * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * @compile invokespecial/Checker.java invokespecial/ClassGenerator.java invokespecial/Generator.java * * @run driver/timeout=1800 invokespecialTests old-int @@ -71,7 +71,6 @@ public class invokespecialTests { System.out.println("\ninvokespecial invocation tests, option: " + option + ", class file version: " + classFileVersion); ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder("-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 --git a/test/hotspot/jtreg/runtime/InvocationTests/invokevirtual/ClassGenerator.java b/test/hotspot/jtreg/runtime/InvocationTests/invokevirtual/ClassGenerator.java index 5fb960d7756..fb6b13fee22 100644 --- a/test/hotspot/jtreg/runtime/InvocationTests/invokevirtual/ClassGenerator.java +++ b/test/hotspot/jtreg/runtime/InvocationTests/invokevirtual/ClassGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2025, 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 invokevirtual; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.Opcodes; import shared.GenericClassGenerator; /*******************************************************************/ diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invokevirtual/Generator.java b/test/hotspot/jtreg/runtime/InvocationTests/invokevirtual/Generator.java index e777364f625..a2ba89c9c95 100644 --- a/test/hotspot/jtreg/runtime/InvocationTests/invokevirtual/Generator.java +++ b/test/hotspot/jtreg/runtime/InvocationTests/invokevirtual/Generator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2025, 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,8 +24,8 @@ package invokevirtual; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_ABSTRACT; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_ABSTRACT; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; import shared.AbstractGenerator; import shared.AccessType; diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java b/test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java index 5f998a6029e..5ab681eba07 100644 --- a/test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java +++ b/test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2025, 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,8 +28,8 @@ * @summary Run invokevirtual invocation tests * @requires vm.flagless * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * @compile invokevirtual/Checker.java invokevirtual/ClassGenerator.java invokevirtual/Generator.java * * @run driver/timeout=1800 invokevirtualTests current-int @@ -41,8 +41,8 @@ * @summary Run invokevirtual invocation tests * @requires vm.flagless * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * @compile invokevirtual/Checker.java invokevirtual/ClassGenerator.java invokevirtual/Generator.java * * @run driver/timeout=1800 invokevirtualTests current-comp @@ -54,8 +54,8 @@ * @summary Run invokevirtual invocation tests * @requires vm.flagless * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * @compile invokevirtual/Checker.java invokevirtual/ClassGenerator.java invokevirtual/Generator.java * * @run driver/timeout=1800 invokevirtualTests old-int @@ -71,7 +71,6 @@ public class invokevirtualTests { System.out.println("\ninvokevirtual invocation tests, option: " + option + ", class file version: " + classFileVersion); ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder("-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 --git a/test/hotspot/jtreg/runtime/InvocationTests/shared/AccessCheck.java b/test/hotspot/jtreg/runtime/InvocationTests/shared/AccessCheck.java index 8e4564d19b0..185a9eeaad3 100644 --- a/test/hotspot/jtreg/runtime/InvocationTests/shared/AccessCheck.java +++ b/test/hotspot/jtreg/runtime/InvocationTests/shared/AccessCheck.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2025, 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 shared; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; /* * @author vi158347 diff --git a/test/hotspot/jtreg/runtime/InvocationTests/shared/AccessType.java b/test/hotspot/jtreg/runtime/InvocationTests/shared/AccessType.java index d456b04ae81..d304485a78e 100644 --- a/test/hotspot/jtreg/runtime/InvocationTests/shared/AccessType.java +++ b/test/hotspot/jtreg/runtime/InvocationTests/shared/AccessType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2025, 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 shared; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; public enum AccessType { PUBLIC ("PUB") { public int value() { return ACC_PUBLIC; } } diff --git a/test/hotspot/jtreg/runtime/InvocationTests/shared/ExecutorGenerator.java b/test/hotspot/jtreg/runtime/InvocationTests/shared/ExecutorGenerator.java index 9adfab82da4..fc2776d5327 100644 --- a/test/hotspot/jtreg/runtime/InvocationTests/shared/ExecutorGenerator.java +++ b/test/hotspot/jtreg/runtime/InvocationTests/shared/ExecutorGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2025, 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,12 +24,12 @@ package shared; -import static jdk.internal.org.objectweb.asm.ClassWriter.*; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.ClassWriter; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.ClassWriter.*; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassWriter; +import static org.objectweb.asm.Opcodes.*; public class ExecutorGenerator { public static final String className = Utils.getInternalName("Test"); diff --git a/test/hotspot/jtreg/runtime/InvocationTests/shared/GenericClassGenerator.java b/test/hotspot/jtreg/runtime/InvocationTests/shared/GenericClassGenerator.java index e0361bdfc74..fba45d4bdb3 100644 --- a/test/hotspot/jtreg/runtime/InvocationTests/shared/GenericClassGenerator.java +++ b/test/hotspot/jtreg/runtime/InvocationTests/shared/GenericClassGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2025, 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,11 +24,11 @@ package shared; -import jdk.internal.org.objectweb.asm.ClassWriter; -import static jdk.internal.org.objectweb.asm.ClassWriter.COMPUTE_FRAMES; -import static jdk.internal.org.objectweb.asm.ClassWriter.COMPUTE_MAXS; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import org.objectweb.asm.ClassWriter; +import static org.objectweb.asm.ClassWriter.COMPUTE_FRAMES; +import static org.objectweb.asm.ClassWriter.COMPUTE_MAXS; +import org.objectweb.asm.MethodVisitor; +import static org.objectweb.asm.Opcodes.*; import static shared.AccessCheck.*; public class GenericClassGenerator { diff --git a/test/hotspot/jtreg/runtime/MirrorFrame/Asmator.java b/test/hotspot/jtreg/runtime/MirrorFrame/Asmator.java index 9ca3262c14c..c5d9a4cb595 100644 --- a/test/hotspot/jtreg/runtime/MirrorFrame/Asmator.java +++ b/test/hotspot/jtreg/runtime/MirrorFrame/Asmator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2025, 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 @@ -21,7 +21,7 @@ * questions. */ -import jdk.internal.org.objectweb.asm.*; +import org.objectweb.asm.*; class Asmator { static byte[] fixup(byte[] buf) throws java.io.IOException { diff --git a/test/hotspot/jtreg/runtime/MirrorFrame/Test8003720.java b/test/hotspot/jtreg/runtime/MirrorFrame/Test8003720.java index 9d0b4149691..43c8fefacd2 100644 --- a/test/hotspot/jtreg/runtime/MirrorFrame/Test8003720.java +++ b/test/hotspot/jtreg/runtime/MirrorFrame/Test8003720.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2025, 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,8 +25,8 @@ * @test * @bug 8003720 * @summary Method in interpreter stack frame can be deallocated - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * @compile -XDignore.symbol.file Victim.java * @run main/othervm -Xverify:all -Xint Test8003720 */ diff --git a/test/hotspot/jtreg/runtime/ParallelLoad/ParallelSuper/AsmClasses.java b/test/hotspot/jtreg/runtime/ParallelLoad/ParallelSuper/AsmClasses.java index e117a5683df..b9b6a5ee909 100644 --- a/test/hotspot/jtreg/runtime/ParallelLoad/ParallelSuper/AsmClasses.java +++ b/test/hotspot/jtreg/runtime/ParallelLoad/ParallelSuper/AsmClasses.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2025, 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 @@ -21,7 +21,7 @@ * questions. */ -import jdk.internal.org.objectweb.asm.*; +import org.objectweb.asm.*; public class AsmClasses implements Opcodes { diff --git a/test/hotspot/jtreg/runtime/ParallelLoad/ParallelSuper/ParallelSuperTest.java b/test/hotspot/jtreg/runtime/ParallelLoad/ParallelSuper/ParallelSuperTest.java index 95a2af9618b..38b6013b693 100644 --- a/test/hotspot/jtreg/runtime/ParallelLoad/ParallelSuper/ParallelSuperTest.java +++ b/test/hotspot/jtreg/runtime/ParallelLoad/ParallelSuper/ParallelSuperTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2025, 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,8 +25,8 @@ * @test MyLoaderTest * @bug 8262046 * @summary Call handle_parallel_super_load, loading parallel threads that throw CCE - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @modules java.base/jdk.internal.misc + * @library /testlibrary/asm * @library /test/lib * @compile -XDignore.symbol.file AsmClasses.java * @compile test-classes/ClassInLoader.java test-classes/A.java test-classes/B.java ../share/ThreadPrint.java diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/AbstractMethodErrorTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/AbstractMethodErrorTest.java index a88deada884..11db5d09da7 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/AbstractMethodErrorTest.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/AbstractMethodErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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 @@ * @summary Test of method selection and resolution cases that * generate AbstractMethodErrorTest * @requires vm.opt.final.ClassUnloading - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @library /runtime/SelectionResolution/classes * @run main/othervm/timeout=300 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies AbstractMethodErrorTest */ diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/IllegalAccessErrorTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/IllegalAccessErrorTest.java index 3af56c50f38..bd0f9e67730 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/IllegalAccessErrorTest.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/IllegalAccessErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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,7 +25,7 @@ * @test * @summary Test of method selection and resolution cases that * generate IllegalAccessErrorTest - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @library /runtime/SelectionResolution/classes * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies IllegalAccessErrorTest */ diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceICCE.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceICCE.java index 0a2afb05248..9212b2d0032 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceICCE.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceICCE.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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 @@ * @summary Test of method selection and resolution cases that * generate IncompatibleClassChangeError * @requires vm.opt.final.ClassUnloading - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @library /runtime/SelectionResolution/classes * @run main/othervm/timeout=500 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeInterfaceICCE */ diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java index 010ec076ad4..4eb3c06e637 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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 @@ * @summary Test of method selection and resolution cases that * generate InvokeInterfaceSuccessTest * @requires vm.opt.final.ClassUnloading - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @library /runtime/SelectionResolution/classes * @run main/othervm/timeout=300 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeInterfaceSuccessTest */ diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeSpecialICCE.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeSpecialICCE.java index 9fee0111263..91b3210368f 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeSpecialICCE.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeSpecialICCE.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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,7 +25,7 @@ * @test * @summary Test of method selection and resolution cases that * generate IncompatibleClassChangeError - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @library /runtime/SelectionResolution/classes * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeSpecialICCE */ diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeSpecialSuccessTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeSpecialSuccessTest.java index eb60df4148d..5e15965bf96 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeSpecialSuccessTest.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeSpecialSuccessTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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,7 +25,7 @@ * @test * @summary Test of method selection and resolution cases that * generate InvokeSpecialSuccessTest - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @library /runtime/SelectionResolution/classes * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeSpecialSuccessTest */ diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeStaticICCE.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeStaticICCE.java index 3ce93c5e03e..23982840935 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeStaticICCE.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeStaticICCE.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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,7 +25,7 @@ * @test * @summary Test of invokestatic method selection and resolution cases that * generate IncompatibleClassChangeError - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @library /runtime/SelectionResolution/classes * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeStaticICCE */ diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeStaticSuccessTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeStaticSuccessTest.java index b10566694ad..ac1f098e5a3 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeStaticSuccessTest.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeStaticSuccessTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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,7 +25,7 @@ * @test * @summary Test of method selection and resolution cases that * generate InvokeStaticSuccessTest - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @library /runtime/SelectionResolution/classes * @run main InvokeStaticSuccessTest */ diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualICCE.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualICCE.java index 5e02b049e34..c041bca153d 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualICCE.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualICCE.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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 @@ * @summary Test of method selection and resolution cases that * generate IncompatibleClassChangeError * @requires vm.opt.final.ClassUnloading - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @library /runtime/SelectionResolution/classes * @run main/othervm/timeout=1200 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeVirtualICCE */ diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualSuccessTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualSuccessTest.java index 80fb1f6537c..a20e934d651 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualSuccessTest.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualSuccessTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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 @@ * @summary Test of method selection and resolution cases that * generate InvokeVirtualSuccessTest * @requires vm.opt.final.ClassUnloading - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @library /runtime/SelectionResolution/classes * @run main/othervm/timeout=400 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeVirtualSuccessTest */ diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/NoSuchMethodErrorTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/NoSuchMethodErrorTest.java index cf8055ff0b8..805daee1b9e 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/NoSuchMethodErrorTest.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/NoSuchMethodErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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,7 +25,7 @@ * @test * @summary Test of method selection and resolution cases that * generate NoSuchMethodError - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @library /runtime/SelectionResolution/classes * @run main NoSuchMethodErrorTest */ diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/ClassBuilder.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/ClassBuilder.java index b453c64de12..f24e45a7a80 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/ClassBuilder.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/ClassBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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,11 +26,11 @@ package selectionresolution; import java.util.ArrayList; import java.util.Iterator; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_ABSTRACT; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PRIVATE; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PROTECTED; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC; +import static org.objectweb.asm.Opcodes.ACC_ABSTRACT; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_PRIVATE; +import static org.objectweb.asm.Opcodes.ACC_PROTECTED; +import static org.objectweb.asm.Opcodes.ACC_STATIC; /** * Constructs classes and interfaces based on the information from a diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/ClassConstruct.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/ClassConstruct.java index c23e5ddb554..901109e8dda 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/ClassConstruct.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/ClassConstruct.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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,8 +25,8 @@ package selectionresolution; import java.io.File; import java.io.FileOutputStream; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Opcodes; public abstract class ClassConstruct { private final ClassWriter cw; diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Clazz.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Clazz.java index 141e5743595..21a726e7834 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Clazz.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Clazz.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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,9 +23,9 @@ package selectionresolution; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER; -import static jdk.internal.org.objectweb.asm.Opcodes.V1_8; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_SUPER; +import static org.objectweb.asm.Opcodes.V1_8; class Clazz extends ClassConstruct { diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Interface.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Interface.java index 371919f2da6..7e7b3282ca7 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Interface.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Interface.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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,9 +23,9 @@ package selectionresolution; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_ABSTRACT; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_INTERFACE; -import static jdk.internal.org.objectweb.asm.Opcodes.V1_8; +import static org.objectweb.asm.Opcodes.ACC_ABSTRACT; +import static org.objectweb.asm.Opcodes.ACC_INTERFACE; +import static org.objectweb.asm.Opcodes.V1_8; class Interface extends ClassConstruct { diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Method.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Method.java index 71631e6c356..a04d790b57b 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Method.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/Method.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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,32 +23,32 @@ package selectionresolution; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.Handle; +import org.objectweb.asm.MethodVisitor; import java.lang.invoke.CallSite; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.ARETURN; -import static jdk.internal.org.objectweb.asm.Opcodes.DUP; -import static jdk.internal.org.objectweb.asm.Opcodes.POP; -import static jdk.internal.org.objectweb.asm.Opcodes.NEW; -import static jdk.internal.org.objectweb.asm.Opcodes.SWAP; -import static jdk.internal.org.objectweb.asm.Opcodes.ASTORE; -import static jdk.internal.org.objectweb.asm.Opcodes.RETURN; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESTATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKEINTERFACE; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKEVIRTUAL; -import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESPECIAL; -import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESTATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKEINTERFACE; -import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKEVIRTUAL; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_STATIC; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ARETURN; +import static org.objectweb.asm.Opcodes.DUP; +import static org.objectweb.asm.Opcodes.POP; +import static org.objectweb.asm.Opcodes.NEW; +import static org.objectweb.asm.Opcodes.SWAP; +import static org.objectweb.asm.Opcodes.ASTORE; +import static org.objectweb.asm.Opcodes.RETURN; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.INVOKESTATIC; +import static org.objectweb.asm.Opcodes.INVOKEINTERFACE; +import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; +import static org.objectweb.asm.Opcodes.H_INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.H_INVOKESTATIC; +import static org.objectweb.asm.Opcodes.H_INVOKEINTERFACE; +import static org.objectweb.asm.Opcodes.H_INVOKEVIRTUAL; class Method { public static final String defaultMethodName = "m"; diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/TestBuilder.java b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/TestBuilder.java index 47eea703f76..d78c504adaa 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/TestBuilder.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/classes/selectionresolution/TestBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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,10 +23,10 @@ package selectionresolution; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.Opcodes; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_STATIC; class TestBuilder extends Builder { private final ClassConstruct testClass; diff --git a/test/hotspot/jtreg/runtime/StackTrace/LargeClassTest.java b/test/hotspot/jtreg/runtime/StackTrace/LargeClassTest.java index d82b4b1f195..16a8535cc44 100644 --- a/test/hotspot/jtreg/runtime/StackTrace/LargeClassTest.java +++ b/test/hotspot/jtreg/runtime/StackTrace/LargeClassTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, 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,19 +26,19 @@ * @bug 8194246 * @summary JVM crashes on stack trace for large number of methods. * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * @run driver LargeClassTest */ import java.io.File; import java.io.FileOutputStream; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.FieldVisitor; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.Label; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Opcodes; import jdk.test.lib.process.ProcessTools; import jdk.test.lib.process.OutputAnalyzer; diff --git a/test/hotspot/jtreg/runtime/TransitiveOverrideCFV50/TransitiveOverrideCFV50.java b/test/hotspot/jtreg/runtime/TransitiveOverrideCFV50/TransitiveOverrideCFV50.java index 909b694d8bc..09283b1e1c9 100644 --- a/test/hotspot/jtreg/runtime/TransitiveOverrideCFV50/TransitiveOverrideCFV50.java +++ b/test/hotspot/jtreg/runtime/TransitiveOverrideCFV50/TransitiveOverrideCFV50.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, 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,17 +23,17 @@ /* * @test 8163808 - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @run main TransitiveOverrideCFV50 */ import java.util.*; import java.io.File; import java.io.FileOutputStream; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Opcodes; /* * Test mixed classfile version overriding handling. diff --git a/test/hotspot/jtreg/runtime/cds/appcds/OldClassTest.java b/test/hotspot/jtreg/runtime/cds/appcds/OldClassTest.java index 3f2ad845e8f..02bed958b8d 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/OldClassTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/OldClassTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, 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 @@ -27,7 +27,7 @@ * @summary CDS support of old classes with major version < JDK_6 (50) for static archive. * @requires vm.cds * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @compile test-classes/Hello.java * @run build TestCommon JarBuilder * @run driver OldClassTest @@ -40,7 +40,7 @@ import jdk.test.lib.process.OutputAnalyzer; import java.nio.file.Files; import java.util.*; -import jdk.internal.org.objectweb.asm.*; +import org.objectweb.asm.*; public class OldClassTest implements Opcodes { @@ -134,7 +134,7 @@ public class Hello { } EOF javac Hello.java -java jdk.internal.org.objectweb.asm.util.ASMifier Hello.class +java org.objectweb.asm.util.ASMifier Hello.class */ diff --git a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest.java b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest.java index b235dbd2eb7..c3c50a106e0 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, 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,7 +28,7 @@ import jdk.test.lib.process.OutputAnalyzer; import java.nio.file.Files; import java.util.*; -import jdk.internal.org.objectweb.asm.*; +import org.objectweb.asm.*; /** * The testsets contained in this class are executed by ./VerifierTest_*.java, so that @@ -330,7 +330,7 @@ public class VerifierTest implements Opcodes { } } - // This was obtained using JDK8: java jdk.internal.org.objectweb.asm.util.ASMifier tmpclasses/UnverifiableBase.class + // This was obtained using JDK8: java org.objectweb.asm.util.ASMifier tmpclasses/UnverifiableBase.class static byte[] makeUnverifiableBase() throws Exception { ClassWriter cw = new ClassWriter(0); FieldVisitor fv; @@ -368,7 +368,7 @@ public class VerifierTest implements Opcodes { return cw.toByteArray(); } - // This was obtained using JDK8: java jdk.internal.org.objectweb.asm.util.ASMifier tmpclasses/UnverifiableIntf.class + // This was obtained using JDK8: java org.objectweb.asm.util.ASMifier tmpclasses/UnverifiableIntf.class static byte[] makeUnverifiableIntf() throws Exception { ClassWriter cw = new ClassWriter(0); FieldVisitor fv; diff --git a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_0.java b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_0.java index 207fc503b28..0311d831fa6 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_0.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_0.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,7 +27,7 @@ * @summary Unverfiable app classes should not be archived. * @requires vm.cds * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @compile test-classes/Greet.java * @compile test-classes/Hi.java * @compile test-classes/VerifierTest0.java diff --git a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1A.java b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1A.java index 68338707120..7790189a046 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1A.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1A.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,7 +27,7 @@ * @summary Unverfiable app classes should not be archived. * @requires vm.cds * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @compile test-classes/Greet.java * @compile test-classes/Hi.java * @compile test-classes/VerifierTest0.java diff --git a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1B.java b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1B.java index 6f07cd41b76..335027a6a0f 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1B.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1B.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,7 +27,7 @@ * @summary Unverfiable app classes should not be archived. * @requires vm.cds * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @compile test-classes/Greet.java * @compile test-classes/Hi.java * @compile test-classes/VerifierTest0.java diff --git a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_2.java b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_2.java index fe4068dac70..ddcd41016d1 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_2.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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 @@ -27,7 +27,7 @@ * @summary Unverfiable app classes should not be archived. * @requires vm.cds * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @compile test-classes/Greet.java * @compile test-classes/Hi.java * @compile test-classes/VerifierTest0.java diff --git a/test/hotspot/jtreg/runtime/exceptionMsgs/IllegalAccessError/IllegalAccessErrorTest.java b/test/hotspot/jtreg/runtime/exceptionMsgs/IllegalAccessError/IllegalAccessErrorTest.java index 0c3bc2d6bc1..a6e4b9c53ad 100644 --- a/test/hotspot/jtreg/runtime/exceptionMsgs/IllegalAccessError/IllegalAccessErrorTest.java +++ b/test/hotspot/jtreg/runtime/exceptionMsgs/IllegalAccessError/IllegalAccessErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -27,7 +27,7 @@ * @test * @summary Test messages of IllegalAccessError. * @modules java.base/java.lang:open - * java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @compile IAE_Loader1.java IAE_Loader2.java IAE78_A.java IAE78_B.java * IllegalAccessErrorTest.java * @run main/othervm -Xbootclasspath/a:. test.IllegalAccessErrorTest @@ -44,9 +44,9 @@ import static java.lang.invoke.MethodHandles.*; import static java.lang.invoke.MethodHandles.Lookup.*; import java.security.*; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; +import static org.objectweb.asm.Opcodes.*; import test.*; diff --git a/test/hotspot/jtreg/runtime/exceptionMsgs/NullPointerException/NullPointerExceptionTest.java b/test/hotspot/jtreg/runtime/exceptionMsgs/NullPointerException/NullPointerExceptionTest.java index 44a21eb7802..e56d283783a 100644 --- a/test/hotspot/jtreg/runtime/exceptionMsgs/NullPointerException/NullPointerExceptionTest.java +++ b/test/hotspot/jtreg/runtime/exceptionMsgs/NullPointerException/NullPointerExceptionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2019 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -30,7 +30,7 @@ * of the variable containing the array is printed. * @bug 8218628 8248476 * @modules java.base/java.lang:open - * java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @library /test/lib * @compile -g NullPointerExceptionTest.java * @run main/othervm -XX:MaxJavaStackTraceDepth=1 -XX:+ShowCodeDetailsInExceptionMessages NullPointerExceptionTest hasDebugInfo @@ -43,7 +43,7 @@ * detailed information about the entity that is null. * @bug 8218628 8248476 * @modules java.base/java.lang:open - * java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @library /test/lib * @compile NullPointerExceptionTest.java * @run main/othervm -XX:MaxJavaStackTraceDepth=1 -XX:+ShowCodeDetailsInExceptionMessages NullPointerExceptionTest @@ -57,27 +57,27 @@ import java.lang.invoke.MethodHandles.Lookup; import java.util.ArrayList; import java.util.Random; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; import jdk.test.lib.Asserts; import jdk.test.lib.Utils; import static java.lang.invoke.MethodHandles.lookup; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER; -import static jdk.internal.org.objectweb.asm.Opcodes.ACONST_NULL; -import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.ASTORE; -import static jdk.internal.org.objectweb.asm.Opcodes.GETFIELD; -import static jdk.internal.org.objectweb.asm.Opcodes.GETSTATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_1; -import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_2; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKEVIRTUAL; -import static jdk.internal.org.objectweb.asm.Opcodes.ARETURN; -import static jdk.internal.org.objectweb.asm.Opcodes.IRETURN; -import static jdk.internal.org.objectweb.asm.Opcodes.RETURN; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_SUPER; +import static org.objectweb.asm.Opcodes.ACONST_NULL; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ASTORE; +import static org.objectweb.asm.Opcodes.GETFIELD; +import static org.objectweb.asm.Opcodes.GETSTATIC; +import static org.objectweb.asm.Opcodes.ICONST_1; +import static org.objectweb.asm.Opcodes.ICONST_2; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; +import static org.objectweb.asm.Opcodes.ARETURN; +import static org.objectweb.asm.Opcodes.IRETURN; +import static org.objectweb.asm.Opcodes.RETURN; /** * Tests NullPointerExceptions @@ -1595,7 +1595,7 @@ public class NullPointerExceptionTest { // } // // This code was adapted from output of - // java jdk.internal.org.objectweb.asm.util.ASMifier E0.class + // java org.objectweb.asm.util.ASMifier E0.class static byte[] generateTestClass() { ClassWriter cw = new ClassWriter(0); MethodVisitor mv; @@ -1817,7 +1817,7 @@ class G { // } // // This code was adapted from output of - // java jdk.internal.org.objectweb.asm.util.ASMifier Sub2G.class + // java org.objectweb.asm.util.ASMifier Sub2G.class static byte[] generateSub2GTestClass() { ClassWriter cw = new ClassWriter(0); MethodVisitor mv; diff --git a/test/hotspot/jtreg/runtime/finalStatic/FinalStatic.java b/test/hotspot/jtreg/runtime/finalStatic/FinalStatic.java index 20c6ddd630e..00ef1cb9a01 100644 --- a/test/hotspot/jtreg/runtime/finalStatic/FinalStatic.java +++ b/test/hotspot/jtreg/runtime/finalStatic/FinalStatic.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, 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,14 +25,14 @@ * @test * @bug 8028553 * @summary Test that VerifyError is not thrown when 'overriding' a static method. - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @run main FinalStatic */ import java.lang.reflect.*; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; /* * class A { static final int m() {return FAIL; } } diff --git a/test/hotspot/jtreg/runtime/invokedynamic/BootstrapMethodErrorTest.java b/test/hotspot/jtreg/runtime/invokedynamic/BootstrapMethodErrorTest.java index d1a270f6229..479f1db24fa 100644 --- a/test/hotspot/jtreg/runtime/invokedynamic/BootstrapMethodErrorTest.java +++ b/test/hotspot/jtreg/runtime/invokedynamic/BootstrapMethodErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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,14 +25,14 @@ * @test * @bug 8051045 8166974 * @summary Test exceptions from invokedynamic and the bootstrap method - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @run main BootstrapMethodErrorTest */ -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Handle; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; import java.lang.invoke.CallSite; import java.lang.invoke.ConstantCallSite; diff --git a/test/hotspot/jtreg/runtime/lambda-features/TestConcreteClassWithAbstractMethod.java b/test/hotspot/jtreg/runtime/lambda-features/TestConcreteClassWithAbstractMethod.java index 748db8dc697..da5128e853b 100644 --- a/test/hotspot/jtreg/runtime/lambda-features/TestConcreteClassWithAbstractMethod.java +++ b/test/hotspot/jtreg/runtime/lambda-features/TestConcreteClassWithAbstractMethod.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, 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,14 +25,14 @@ * @test * @bug 8032010 * @summary method lookup on an abstract method in a concrete class should be successful - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @run main TestConcreteClassWithAbstractMethod */ -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; /* * class T1 { public int m() {} } diff --git a/test/hotspot/jtreg/runtime/lambda-features/TestStaticandInstance.java b/test/hotspot/jtreg/runtime/lambda-features/TestStaticandInstance.java index dae0066bc9a..452de973c91 100644 --- a/test/hotspot/jtreg/runtime/lambda-features/TestStaticandInstance.java +++ b/test/hotspot/jtreg/runtime/lambda-features/TestStaticandInstance.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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,14 +25,14 @@ * @test * @bug 8087342 * @summary Test linkresolver search static, instance and overpass duplicates - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:-BytecodeVerificationRemote -XX:-BytecodeVerificationLocal TestStaticandInstance */ import java.util.*; -import jdk.internal.org.objectweb.asm.*; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import org.objectweb.asm.*; +import static org.objectweb.asm.Opcodes.*; public class TestStaticandInstance { static final String stringC = "C"; diff --git a/test/hotspot/jtreg/runtime/verifier/OverriderMsg.java b/test/hotspot/jtreg/runtime/verifier/OverriderMsg.java index 5b24caacd3e..305b5d37869 100644 --- a/test/hotspot/jtreg/runtime/verifier/OverriderMsg.java +++ b/test/hotspot/jtreg/runtime/verifier/OverriderMsg.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, 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,9 +23,9 @@ import java.io.File; import java.io.FileOutputStream; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; +import static org.objectweb.asm.Opcodes.*; import jdk.test.lib.process.ProcessTools; import jdk.test.lib.process.OutputAnalyzer; @@ -33,8 +33,8 @@ import jdk.test.lib.process.OutputAnalyzer; * @test OverriderMsg * @bug 8026894 * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * java.management * @compile -XDignore.symbol.file OverriderMsg.java * @run driver OverriderMsg diff --git a/test/hotspot/jtreg/runtime/verifier/TestANewArray.java b/test/hotspot/jtreg/runtime/verifier/TestANewArray.java index 011749133da..e1b0dcf764c 100644 --- a/test/hotspot/jtreg/runtime/verifier/TestANewArray.java +++ b/test/hotspot/jtreg/runtime/verifier/TestANewArray.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, 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,9 @@ import java.io.File; import java.io.FileOutputStream; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; +import static org.objectweb.asm.Opcodes.*; import jdk.test.lib.process.ProcessTools; import jdk.test.lib.process.OutputAnalyzer; @@ -36,7 +36,7 @@ import jdk.test.lib.process.OutputAnalyzer; * @summary Test that anewarray bytecode is valid only if it specifies 254 or fewer dimensions. * 255 is invalid because the anewarray would then create an array with 256 dimensions. * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @compile -XDignore.symbol.file TestANewArray.java * @run driver TestANewArray 49 * @run driver TestANewArray 52 diff --git a/test/hotspot/jtreg/runtime/verifier/TestMultiANewArray.java b/test/hotspot/jtreg/runtime/verifier/TestMultiANewArray.java index 6f04278c4cd..24058835ed8 100644 --- a/test/hotspot/jtreg/runtime/verifier/TestMultiANewArray.java +++ b/test/hotspot/jtreg/runtime/verifier/TestMultiANewArray.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, 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,9 +23,9 @@ import java.io.File; import java.io.FileOutputStream; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import static jdk.internal.org.objectweb.asm.Opcodes.*; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; +import static org.objectweb.asm.Opcodes.*; import jdk.test.lib.process.ProcessTools; import jdk.test.lib.process.OutputAnalyzer; @@ -33,8 +33,8 @@ import jdk.test.lib.process.OutputAnalyzer; * @test TestMultiANewArray * @bug 8038076 * @library /test/lib - * @modules java.base/jdk.internal.org.objectweb.asm - * java.base/jdk.internal.misc + * @library /testlibrary/asm + * @modules java.base/jdk.internal.misc * java.management * @compile -XDignore.symbol.file TestMultiANewArray.java * @run driver TestMultiANewArray 49 diff --git a/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerQueueTest.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerQueueTest.java index 7449165cc7a..f5c4808b1c7 100644 --- a/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerQueueTest.java +++ b/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerQueueTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, 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 @@ -71,7 +71,7 @@ public class CompilerQueueTest { * 762 3 java.lang.invoke.MethodType::basicType (8 bytes) * 763 3 java.util.ArrayList::rangeCheck (22 bytes) * 764 3 java.util.ArrayList::elementData (7 bytes) - * 765 3 jdk.internal.org.objectweb.asm.MethodVisitor:: (35 bytes) + * 765 3 org.objectweb.asm.MethodVisitor:: (35 bytes) * 766 1 CompilerQueueTest::testcaseMethod1 (1 bytes) * 767 2 CompilerQueueTest::testcaseMethod2 (1 bytes) * 768 3 CompilerQueueTest::testcaseMethod3 (1 bytes) diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/MissedStackMapFrames/MissedStackMapFrames.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/MissedStackMapFrames/MissedStackMapFrames.java index 52620294aa7..534f077eaf4 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/MissedStackMapFrames/MissedStackMapFrames.java +++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/MissedStackMapFrames/MissedStackMapFrames.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2025, 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 @@ -27,16 +27,16 @@ * @bug 8228604 * * @requires vm.jvmti - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @library /test/lib * * @run main/othervm/native -agentlib:MissedStackMapFrames MissedStackMapFrames */ -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; public class MissedStackMapFrames { diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineAnnotations.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineAnnotations.java index 2df9fbd2263..aad876d7181 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineAnnotations.java +++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineAnnotations.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, 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,11 +24,11 @@ /* * @test * @library /test/lib + * @library /testlibrary/asm * @summary Test that type annotations are retained after a retransform * @requires vm.jvmti * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.instrument + * @modules java.instrument * jdk.jartool/sun.tools.jar * @run main RedefineAnnotations buildagent * @run main/othervm -javaagent:redefineagent.jar RedefineAnnotations @@ -61,11 +61,11 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.Map; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.FieldVisitor; -import static jdk.internal.org.objectweb.asm.Opcodes.ASM7; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.FieldVisitor; +import static org.objectweb.asm.Opcodes.ASM7; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE_USE) diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineGenericSignatureTest.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineGenericSignatureTest.java index 04ccd12cc36..f220a93f187 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineGenericSignatureTest.java +++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineGenericSignatureTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025, 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,8 +26,8 @@ * @bug 8282241 * @summary Verifies class redefinition correctly updates generic_signature and source_file_name attributes * @requires vm.jvmti - * @modules java.base/jdk.internal.org.objectweb.asm - * java.instrument + * @modules java.instrument + * @library /testlibrary/asm * @library /test/lib * @run main RedefineClassHelper * @run main/othervm -javaagent:redefineagent.jar --add-opens=java.base/java.lang=ALL-UNNAMED RedefineGenericSignatureTest @@ -42,10 +42,10 @@ import java.lang.reflect.Type; import java.nio.file.Files; import java.util.List; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Opcodes; import jdk.test.lib.Asserts; import jdk.test.lib.JDKToolLauncher; import jdk.test.lib.compiler.InMemoryJavaCompiler; diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineObject.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineObject.java index 0490d11b6c8..de90c15b5a5 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineObject.java +++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2025, 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 @@ -27,8 +27,8 @@ * @summary Ensure Object natives stay registered after redefinition * @requires vm.jvmti * @library /test/lib + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * java.base/jdk.internal.org.objectweb.asm * java.compiler * java.instrument * jdk.jartool/sun.tools.jar @@ -48,12 +48,12 @@ import java.lang.instrument.UnmodifiableClassException; import java.security.ProtectionDomain; import java.util.Arrays; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.ClassWriter; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; -import static jdk.internal.org.objectweb.asm.Opcodes.ASM6; -import static jdk.internal.org.objectweb.asm.Opcodes.V1_8; +import static org.objectweb.asm.Opcodes.ASM6; +import static org.objectweb.asm.Opcodes.V1_8; public class RedefineObject { diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRetransform/RedefineRetransform.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRetransform/RedefineRetransform.java index 3340740ebd6..a09d1dc318e 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRetransform/RedefineRetransform.java +++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRetransform/RedefineRetransform.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025, 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 @@ -27,7 +27,7 @@ * @bug 7124710 * * @requires vm.jvmti - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @library /test/lib * * @comment main/othervm/native -Xlog:redefine*=trace -agentlib:RedefineRetransform RedefineRetransform @@ -43,12 +43,12 @@ import java.io.IOException; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; /* * The test verifies that after interleaved RedefineClasses/RetransformClasses calls diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRunningMethodsWithResolutionErrors.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRunningMethodsWithResolutionErrors.java index f18fd6d883e..0f221076bc0 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRunningMethodsWithResolutionErrors.java +++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRunningMethodsWithResolutionErrors.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, 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 @@ -27,18 +27,18 @@ * @summary Redefine running methods that have cached resolution errors * @requires vm.jvmti * @library /test/lib + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * @modules java.base/jdk.internal.org.objectweb.asm - * java.instrument + * @modules java.instrument * jdk.jartool/sun.tools.jar * @run main RedefineClassHelper * @run main/othervm -javaagent:redefineagent.jar -Xlog:redefine+class+iklass+add=trace,redefine+class+iklass+purge=trace RedefineRunningMethodsWithResolutionErrors */ -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; import java.lang.reflect.InvocationTargetException; diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineVerifyError.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineVerifyError.java index ea511c05b59..fa6bf0b98d4 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineVerifyError.java +++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineVerifyError.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2025, 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 @@ -27,8 +27,8 @@ * @summary Redefine VerifyError to get a VerifyError should not throw SOE * @requires vm.jvmti * @library /test/lib + * @library /testlibrary/asm * @modules java.base/jdk.internal.misc - * java.base/jdk.internal.org.objectweb.asm * java.compiler * java.instrument * jdk.jartool/sun.tools.jar @@ -39,19 +39,19 @@ * RedefineVerifyError */ -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.Attribute; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.ConstantDynamic; -import jdk.internal.org.objectweb.asm.FieldVisitor; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.RecordComponentVisitor; -import jdk.internal.org.objectweb.asm.Type; -import jdk.internal.org.objectweb.asm.TypePath; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Attribute; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.ConstantDynamic; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.Handle; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.RecordComponentVisitor; +import org.objectweb.asm.Type; +import org.objectweb.asm.TypePath; public class RedefineVerifyError implements Opcodes { diff --git a/test/hotspot/jtreg/serviceability/jvmti/SetBreakpoint/TestManyBreakpoints.java b/test/hotspot/jtreg/serviceability/jvmti/SetBreakpoint/TestManyBreakpoints.java index bc935ea99d1..02e65b834e8 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/SetBreakpoint/TestManyBreakpoints.java +++ b/test/hotspot/jtreg/serviceability/jvmti/SetBreakpoint/TestManyBreakpoints.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025, 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,7 +25,7 @@ * @test * @bug 8144992 * @requires vm.jvmti - * @modules java.base/jdk.internal.org.objectweb.asm + * @library /testlibrary/asm * @run main/othervm/native -agentlib:TestManyBreakpoints * -Xlog:gc+metaspace * -Xint @@ -33,10 +33,10 @@ * TestManyBreakpoints */ -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; public class TestManyBreakpoints { diff --git a/src/java.base/share/legal/asm.md b/test/hotspot/jtreg/testlibrary/asm/asm.md similarity index 100% rename from src/java.base/share/legal/asm.md rename to test/hotspot/jtreg/testlibrary/asm/asm.md diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/AnnotationVisitor.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/AnnotationVisitor.java index f62f724665f..a8540446be0 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/AnnotationVisitor.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * A visitor to visit a Java annotation. The methods of this class must be called in the following diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/AnnotationWriter.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/AnnotationWriter.java index fb4ae268d82..179f402db0e 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/AnnotationWriter.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * An {@link AnnotationVisitor} that generates a corresponding 'annotation' or 'type_annotation' diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Attribute.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Attribute.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/Attribute.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Attribute.java index 9c5ce91e3ff..f52ecd26c91 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Attribute.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Attribute.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * A non standard class, field, method or Code attribute, as defined in the Java Virtual Machine diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ByteVector.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ByteVector.java index 33a66b2c12e..a79276bb55a 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ByteVector.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * A dynamically extensible vector of bytes. This class is roughly equivalent to a DataOutputStream diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassReader.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassReader.java index 91995e44ce6..643a6501470 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassReader.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassTooLargeException.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassTooLargeException.java similarity index 94% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassTooLargeException.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassTooLargeException.java index c110ec34c74..23485b7b39a 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassTooLargeException.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassTooLargeException.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * Exception thrown when the constant pool of a class produced by a {@link ClassWriter} is too @@ -75,7 +75,7 @@ public final class ClassTooLargeException extends IndexOutOfBoundsException { * Constructs a new {@link ClassTooLargeException}. * * @param className the internal name of the class (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * org.objectweb.asm.Type#getInternalName()}). * @param constantPoolCount the number of constant pool items of the class. */ public ClassTooLargeException(final String className, final int constantPoolCount) { @@ -85,7 +85,7 @@ public final class ClassTooLargeException extends IndexOutOfBoundsException { } /** - * Returns the internal name of the class (see {@link jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * Returns the internal name of the class (see {@link org.objectweb.asm.Type#getInternalName()}). * * @return the internal name of the class. */ diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassVisitor.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassVisitor.java index 21a9c721766..601e4ba26cd 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassVisitor.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * A visitor to visit a Java class. The methods of this class must be called in the following order: diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassWriter.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassWriter.java index 3996cbdf2e1..ea28726914f 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassWriter.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * A {@link ClassVisitor} that generates a corresponding ClassFile structure, as defined in the Java diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ConstantDynamic.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ConstantDynamic.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/ConstantDynamic.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ConstantDynamic.java index cb992f839ef..5a0839d0ec8 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ConstantDynamic.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ConstantDynamic.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; import java.util.Arrays; diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Constants.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Constants.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/Constants.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Constants.java index 0fc081fe391..79458f372b9 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Constants.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Constants.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; import java.io.DataInputStream; import java.io.IOException; diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Context.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Context.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/Context.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Context.java index bec67f5333b..da3e2299e8f 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Context.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Context.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * Information about a class being parsed in a {@link ClassReader}. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/CurrentFrame.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/CurrentFrame.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/CurrentFrame.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/CurrentFrame.java index 580b9a95415..b8793dc32b8 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/CurrentFrame.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/CurrentFrame.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * Information about the input stack map frame at the "current" instruction of a method. This is diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Edge.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Edge.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/Edge.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Edge.java index 59a7ee83fdb..75b958cb2b0 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Edge.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Edge.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * An edge in the control flow graph of a method. Each node of this graph is a basic block, diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/FieldVisitor.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/FieldVisitor.java index 7d29f3d4ff7..e2498838088 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/FieldVisitor.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * A visitor to visit a Java field. The methods of this class must be called in the following order: diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/FieldWriter.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/FieldWriter.java index c3e78d04cd6..758957af78e 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/FieldWriter.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * A {@link FieldVisitor} that generates a corresponding 'field_info' structure, as defined in the diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Frame.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Frame.java index cfb892e60b0..9e23a72e845 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Frame.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * The input and output stack map frames of a basic block. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handle.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Handle.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handle.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Handle.java index 7e5a9e1a3b3..453bda26faf 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handle.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Handle.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * A reference to a field or a method. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handler.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Handler.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handler.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Handler.java index 3d86e222ab8..20fb28de1b6 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handler.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Handler.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * Information about an exception handler. Corresponds to an element of the exception_table array of diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Label.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Label.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/Label.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Label.java index c321fc8a200..d26fcdef6f4 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Label.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Label.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * A position in the bytecode of a method. Labels are used for jump, goto, and switch instructions, diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodTooLargeException.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/MethodTooLargeException.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodTooLargeException.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/MethodTooLargeException.java index a2c9cee1836..6e64a4175f3 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodTooLargeException.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/MethodTooLargeException.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * Exception thrown when the Code attribute of a method produced by a {@link ClassWriter} is too diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/MethodVisitor.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/MethodVisitor.java index 08c3adb2171..eca1beb9ac3 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/MethodVisitor.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * A visitor to visit a Java method. The methods of this class must be called in the following diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/MethodWriter.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/MethodWriter.java index efeffc7b1eb..b296abe594e 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/MethodWriter.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * A {@link MethodVisitor} that generates a corresponding 'method_info' structure, as defined in the diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ModuleVisitor.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ModuleVisitor.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/ModuleVisitor.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ModuleVisitor.java index 0e8f484368b..4350beaaab7 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ModuleVisitor.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ModuleVisitor.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * A visitor to visit a Java module. The methods of this class must be called in the following diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ModuleWriter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ModuleWriter.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/ModuleWriter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ModuleWriter.java index 18b1a22fb36..820d4a1d188 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ModuleWriter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ModuleWriter.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * A {@link ModuleVisitor} that generates the corresponding Module, ModulePackages and diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Opcodes.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Opcodes.java index 12ac4e0a417..d6d8e36fc15 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Opcodes.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * The JVM opcodes, access flags and array type codes. This interface does not define all the JVM diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/RecordComponentVisitor.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/RecordComponentVisitor.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/RecordComponentVisitor.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/RecordComponentVisitor.java index ad0aad6b0e6..6dec81a9585 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/RecordComponentVisitor.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/RecordComponentVisitor.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * A visitor to visit a record component. The methods of this class must be called in the following diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/RecordComponentWriter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/RecordComponentWriter.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/RecordComponentWriter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/RecordComponentWriter.java index 3098cf70c8d..5ed8fceb844 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/RecordComponentWriter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/RecordComponentWriter.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; final class RecordComponentWriter extends RecordComponentVisitor { /** Where the constants used in this RecordComponentWriter must be stored. */ diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Symbol.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Symbol.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/Symbol.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Symbol.java index a45f75a0301..88c6e802db4 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Symbol.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Symbol.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * An entry of the constant pool, of the BootstrapMethods attribute, or of the (ASM specific) type diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/SymbolTable.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/SymbolTable.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/SymbolTable.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/SymbolTable.java index 5fc629d6809..cf940d5d1d4 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/SymbolTable.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/SymbolTable.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * The constant pool entries, the BootstrapMethods attribute entries and the (ASM specific) type diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Type.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Type.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/Type.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Type.java index 739b9444d2e..b01788a366d 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Type.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Type.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; import java.lang.reflect.Constructor; import java.lang.reflect.Method; diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/TypePath.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/TypePath.java index ea1025dd172..b4dd2bae424 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/TypePath.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * The path to a type argument, wildcard bound, array element type, or static inner type within an diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/TypeReference.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/TypeReference.java index 512dc8fc8ac..5d157999dad 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/TypeReference.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm; +package org.objectweb.asm; /** * A reference to a type appearing in a class, field or method declaration, or on an instruction. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/AdviceAdapter.java similarity index 98% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/AdviceAdapter.java index 0d57c484f05..c3494a9679f 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/AdviceAdapter.java @@ -57,18 +57,18 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import jdk.internal.org.objectweb.asm.ConstantDynamic; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; +import org.objectweb.asm.ConstantDynamic; +import org.objectweb.asm.Handle; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; /** * A {@link MethodVisitor} to insert before, after and around advices in methods and constructors. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/AnalyzerAdapter.java similarity index 98% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/AnalyzerAdapter.java index 36a5a06d441..cbfb0ffd3d8 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/AnalyzerAdapter.java @@ -57,23 +57,23 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import jdk.internal.org.objectweb.asm.ConstantDynamic; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; +import org.objectweb.asm.ConstantDynamic; +import org.objectweb.asm.Handle; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; /** * A {@link MethodVisitor} that keeps track of stack map frame changes between {@link * #visitFrame(int, int, Object[], int, Object[])} calls. This adapter must be used with the {@link - * jdk.internal.org.objectweb.asm.ClassReader#EXPAND_FRAMES} option. Each visitX instruction delegates to + * org.objectweb.asm.ClassReader#EXPAND_FRAMES} option. Each visitX instruction delegates to * the next visitor in the chain, if any, and then simulates the effect of this instruction on the * stack map frame, represented by {@link #locals} and {@link #stack}. The next visitor in the chain * can get the state of the stack map frame before each instruction by reading the value of diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnnotationRemapper.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/AnnotationRemapper.java similarity index 98% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnnotationRemapper.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/AnnotationRemapper.java index 4fdfbccc06b..1e4a932d605 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnnotationRemapper.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/AnnotationRemapper.java @@ -57,10 +57,10 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Opcodes; /** * An {@link AnnotationVisitor} that remaps types with a {@link Remapper}. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ClassRemapper.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/ClassRemapper.java similarity index 96% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ClassRemapper.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/ClassRemapper.java index 03a576189d4..bce6e47937a 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ClassRemapper.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/ClassRemapper.java @@ -57,18 +57,18 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; import java.util.List; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.Attribute; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.FieldVisitor; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.ModuleVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.RecordComponentVisitor; -import jdk.internal.org.objectweb.asm.TypePath; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Attribute; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.ModuleVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.RecordComponentVisitor; +import org.objectweb.asm.TypePath; /** * A {@link ClassVisitor} that remaps types with a {@link Remapper}. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/CodeSizeEvaluator.java similarity index 96% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/CodeSizeEvaluator.java index 2392cdcd0be..f656f1a42f7 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/CodeSizeEvaluator.java @@ -57,13 +57,13 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; -import jdk.internal.org.objectweb.asm.ConstantDynamic; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ConstantDynamic; +import org.objectweb.asm.Handle; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; /** * A {@link MethodVisitor} that approximates the size of the methods it visits. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/FieldRemapper.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/FieldRemapper.java similarity index 96% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/FieldRemapper.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/FieldRemapper.java index 205f985d87e..db7e0b14594 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/FieldRemapper.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/FieldRemapper.java @@ -57,12 +57,12 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.FieldVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.TypePath; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.TypePath; /** * A {@link FieldVisitor} that remaps types with a {@link Remapper}. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/GeneratorAdapter.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/GeneratorAdapter.java index ecf4ac10dfb..da9e71676cb 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/GeneratorAdapter.java @@ -57,18 +57,18 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.ConstantDynamic; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ConstantDynamic; +import org.objectweb.asm.Handle; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; /** * A {@link MethodVisitor} with convenient methods to generate code. For example, using this diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/InstructionAdapter.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/InstructionAdapter.java index e449c310b3b..534b71e2e13 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/InstructionAdapter.java @@ -57,14 +57,14 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; -import jdk.internal.org.objectweb.asm.ConstantDynamic; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; +import org.objectweb.asm.ConstantDynamic; +import org.objectweb.asm.Handle; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; /** * A {@link MethodVisitor} providing a more detailed API to generate and transform instructions. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/JSRInlinerAdapter.java similarity index 96% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/JSRInlinerAdapter.java index 2f1565222ec..97dca35b4f1 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/JSRInlinerAdapter.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; import java.util.AbstractMap; import java.util.ArrayList; @@ -67,22 +67,22 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode; -import jdk.internal.org.objectweb.asm.tree.InsnList; -import jdk.internal.org.objectweb.asm.tree.InsnNode; -import jdk.internal.org.objectweb.asm.tree.JumpInsnNode; -import jdk.internal.org.objectweb.asm.tree.LabelNode; -import jdk.internal.org.objectweb.asm.tree.LocalVariableNode; -import jdk.internal.org.objectweb.asm.tree.LookupSwitchInsnNode; -import jdk.internal.org.objectweb.asm.tree.MethodNode; -import jdk.internal.org.objectweb.asm.tree.TableSwitchInsnNode; -import jdk.internal.org.objectweb.asm.tree.TryCatchBlockNode; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.InsnList; +import org.objectweb.asm.tree.InsnNode; +import org.objectweb.asm.tree.JumpInsnNode; +import org.objectweb.asm.tree.LabelNode; +import org.objectweb.asm.tree.LocalVariableNode; +import org.objectweb.asm.tree.LookupSwitchInsnNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.TableSwitchInsnNode; +import org.objectweb.asm.tree.TryCatchBlockNode; /** - * A {@link jdk.internal.org.objectweb.asm.MethodVisitor} that removes JSR instructions and inlines the + * A {@link org.objectweb.asm.MethodVisitor} that removes JSR instructions and inlines the * referenced subroutines. * * @author Niko Matsakis @@ -121,7 +121,7 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes { * @param descriptor the method's descriptor. * @param signature the method's signature. May be {@literal null}. * @param exceptions the internal names of the method's exception classes (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. + * org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. * @throws IllegalStateException if a subclass calls this constructor. */ public JSRInlinerAdapter( @@ -157,7 +157,7 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes { * @param descriptor the method's descriptor. * @param signature the method's signature. May be {@literal null}. * @param exceptions the internal names of the method's exception classes (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. + * org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. */ protected JSRInlinerAdapter( final int api, diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/LocalVariablesSorter.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/LocalVariablesSorter.java index c4063340943..f2c56d703b3 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/LocalVariablesSorter.java @@ -57,14 +57,14 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; -import jdk.internal.org.objectweb.asm.TypePath; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; +import org.objectweb.asm.TypePath; /** * A {@link MethodVisitor} that renumbers local variables in their order of appearance. This adapter diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/Method.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/Method.java index 96b1885308c..ce51f6dedda 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/Method.java @@ -57,11 +57,11 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; import java.util.HashMap; import java.util.Map; -import jdk.internal.org.objectweb.asm.Type; +import org.objectweb.asm.Type; /** * A named method descriptor. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/MethodRemapper.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/MethodRemapper.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/MethodRemapper.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/MethodRemapper.java index c2335077e8b..3e6b3056dcb 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/MethodRemapper.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/MethodRemapper.java @@ -57,14 +57,14 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.TypePath; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Handle; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.TypePath; /** * A {@link MethodVisitor} that remaps types with a {@link Remapper}. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleHashesAttribute.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/ModuleHashesAttribute.java similarity index 95% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleHashesAttribute.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/ModuleHashesAttribute.java index 7bf0934ab2e..046bc162078 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleHashesAttribute.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/ModuleHashesAttribute.java @@ -57,15 +57,15 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; import java.util.ArrayList; import java.util.List; -import jdk.internal.org.objectweb.asm.Attribute; -import jdk.internal.org.objectweb.asm.ByteVector; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Label; +import org.objectweb.asm.Attribute; +import org.objectweb.asm.ByteVector; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Label; /** * A ModuleHashes attribute. This attribute is specific to the OpenJDK and may change in the future. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleRemapper.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/ModuleRemapper.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleRemapper.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/ModuleRemapper.java index d843a715451..dc11c89d5c7 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleRemapper.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/ModuleRemapper.java @@ -57,10 +57,10 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; -import jdk.internal.org.objectweb.asm.ModuleVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ModuleVisitor; +import org.objectweb.asm.Opcodes; /** * A {@link ModuleVisitor} that remaps types with a {@link Remapper}. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleResolutionAttribute.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/ModuleResolutionAttribute.java similarity index 95% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleResolutionAttribute.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/ModuleResolutionAttribute.java index 5ccee829a90..7d4223aa7e6 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleResolutionAttribute.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/ModuleResolutionAttribute.java @@ -57,13 +57,13 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; -import jdk.internal.org.objectweb.asm.Attribute; -import jdk.internal.org.objectweb.asm.ByteVector; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Label; +import org.objectweb.asm.Attribute; +import org.objectweb.asm.ByteVector; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Label; /** * A ModuleResolution attribute. This attribute is specific to the OpenJDK and may change in the diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleTargetAttribute.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/ModuleTargetAttribute.java similarity index 94% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleTargetAttribute.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/ModuleTargetAttribute.java index 8d61baadd2e..e53b099d7bf 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleTargetAttribute.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/ModuleTargetAttribute.java @@ -57,13 +57,13 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; -import jdk.internal.org.objectweb.asm.Attribute; -import jdk.internal.org.objectweb.asm.ByteVector; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Label; +import org.objectweb.asm.Attribute; +import org.objectweb.asm.ByteVector; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Label; /** * A ModuleTarget attribute. This attribute is specific to the OpenJDK and may change in the future. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RecordComponentRemapper.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/RecordComponentRemapper.java similarity index 94% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RecordComponentRemapper.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/RecordComponentRemapper.java index 017f24a7440..e9aeef2012f 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RecordComponentRemapper.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/RecordComponentRemapper.java @@ -57,12 +57,12 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.RecordComponentVisitor; -import jdk.internal.org.objectweb.asm.TypePath; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.RecordComponentVisitor; +import org.objectweb.asm.TypePath; /** * A {@link RecordComponentVisitor} that remaps types with a {@link Remapper}. @@ -91,7 +91,7 @@ public class RecordComponentRemapper extends RecordComponentVisitor { * Constructs a new {@link RecordComponentRemapper}. * * @param api the ASM API version supported by this remapper. Must be one of {@link - * jdk.internal.org.objectweb.asm.Opcodes#ASM8} or {@link jdk.internal.org.objectweb.asm.Opcodes#ASM9}. + * org.objectweb.asm.Opcodes#ASM8} or {@link org.objectweb.asm.Opcodes#ASM9}. * @param recordComponentVisitor the record component visitor this remapper must delegate to. * @param remapper the remapper to use to remap the types in the visited record component. */ diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/Remapper.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/Remapper.java index aba7f0f21ff..e6e77e2dfa3 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/Remapper.java @@ -57,15 +57,15 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; -import jdk.internal.org.objectweb.asm.ConstantDynamic; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; -import jdk.internal.org.objectweb.asm.signature.SignatureReader; -import jdk.internal.org.objectweb.asm.signature.SignatureVisitor; -import jdk.internal.org.objectweb.asm.signature.SignatureWriter; +import org.objectweb.asm.ConstantDynamic; +import org.objectweb.asm.Handle; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; +import org.objectweb.asm.signature.SignatureReader; +import org.objectweb.asm.signature.SignatureVisitor; +import org.objectweb.asm.signature.SignatureWriter; /** * A class responsible for remapping types and names. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/RemappingAnnotationAdapter.java similarity index 96% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/RemappingAnnotationAdapter.java index 0f41cff5354..5fa2818c269 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/RemappingAnnotationAdapter.java @@ -56,10 +56,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Opcodes; /** * An {@link AnnotationVisitor} adapter for type remapping. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/RemappingMethodAdapter.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/RemappingMethodAdapter.java index 68ad22a4793..ac3d87c5c11 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/RemappingMethodAdapter.java @@ -56,14 +56,14 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.TypePath; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Handle; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.TypePath; /** * A {@link LocalVariablesSorter} for type mapping. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java similarity index 98% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java index 58173483b19..e3b0509adf5 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; import java.io.ByteArrayOutputStream; import java.io.DataOutput; @@ -68,10 +68,10 @@ import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.FieldVisitor; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; /** * A {@link ClassVisitor} that adds a serial version unique identifier to a class if missing. A diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SignatureRemapper.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/SignatureRemapper.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SignatureRemapper.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/SignatureRemapper.java index 5fb41c84cca..170dc1c322d 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SignatureRemapper.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/SignatureRemapper.java @@ -57,11 +57,11 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; import java.util.ArrayList; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.signature.SignatureVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.signature.SignatureVisitor; /** * A {@link SignatureVisitor} that remaps types with a {@link Remapper}. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/SimpleRemapper.java similarity index 96% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/SimpleRemapper.java index 9b298b15e39..d1fd53f6b6a 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/SimpleRemapper.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; import java.util.Collections; import java.util.Map; @@ -85,7 +85,7 @@ public class SimpleRemapper extends Remapper { * attribute (in the form <owner>.<name>), and the value is the new field * name. *
  • for internal names, the key is the old internal name, and the value is the new - * internal name (see {@link jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * internal name (see {@link org.objectweb.asm.Type#getInternalName()}). * */ public SimpleRemapper(final Map mapping) { @@ -98,7 +98,7 @@ public class SimpleRemapper extends Remapper { * @param oldName the key corresponding to a method, field or internal name (see {@link * #SimpleRemapper(Map)} for the format of these keys). * @param newName the new method, field or internal name (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * org.objectweb.asm.Type#getInternalName()}). */ public SimpleRemapper(final String oldName, final String newName) { this.mapping = Collections.singletonMap(oldName, newName); diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/StaticInitMerger.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/StaticInitMerger.java index 1a03a9e0923..90975c00cd7 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/StaticInitMerger.java @@ -57,11 +57,11 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; /** * A {@link ClassVisitor} that merges <clinit> methods into a single one. All the existing diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/TableSwitchGenerator.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/TableSwitchGenerator.java index 0f8ada93b39..a7e0ec7f8be 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/TableSwitchGenerator.java @@ -57,9 +57,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; -import jdk.internal.org.objectweb.asm.Label; +import org.objectweb.asm.Label; /** * A code generator for switch statements. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/TryCatchBlockSorter.java similarity index 93% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/TryCatchBlockSorter.java index 6cd6b1ec08b..decde6faf38 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/commons/TryCatchBlockSorter.java @@ -57,14 +57,14 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.commons; +package org.objectweb.asm.commons; import java.util.Collections; import java.util.Comparator; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.tree.MethodNode; -import jdk.internal.org.objectweb.asm.tree.TryCatchBlockNode; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.TryCatchBlockNode; /** * A {@link MethodVisitor} adapter to sort the exception handlers. The handlers are sorted in a @@ -88,11 +88,11 @@ public class TryCatchBlockSorter extends MethodNode { * @param access the method's access flags (see {@link Opcodes}). This parameter also indicates if * the method is synthetic and/or deprecated. * @param name the method's name. - * @param descriptor the method's descriptor (see {@link jdk.internal.org.objectweb.asm.Type}). + * @param descriptor the method's descriptor (see {@link org.objectweb.asm.Type}). * @param signature the method's signature. May be {@literal null} if the method parameters, * return type and exceptions do not use generic types. * @param exceptions the internal names of the method's exception classes (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. + * org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. */ public TryCatchBlockSorter( final MethodVisitor methodVisitor, diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/signature/SignatureReader.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/signature/SignatureReader.java index 76901452a4c..67c79e325f0 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/signature/SignatureReader.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.signature; +package org.objectweb.asm.signature; /** * A parser for signature literals, as defined in the Java Virtual Machine Specification (JVMS), to @@ -86,9 +86,9 @@ public class SignatureReader { * Makes the given visitor visit the signature of this {@link SignatureReader}. This signature is * the one specified in the constructor (see {@link #SignatureReader}). This method is intended to * be called on a {@link SignatureReader} that was created using a ClassSignature (such as - * the signature parameter of the {@link jdk.internal.org.objectweb.asm.ClassVisitor#visit} + * the signature parameter of the {@link org.objectweb.asm.ClassVisitor#visit} * method) or a MethodSignature (such as the signature parameter of the {@link - * jdk.internal.org.objectweb.asm.ClassVisitor#visitMethod} method). + * org.objectweb.asm.ClassVisitor#visitMethod} method). * * @param signatureVistor the visitor that must visit this signature. */ @@ -163,8 +163,8 @@ public class SignatureReader { * the one specified in the constructor (see {@link #SignatureReader}). This method is intended to * be called on a {@link SignatureReader} that was created using a JavaTypeSignature, such * as the signature parameter of the {@link - * jdk.internal.org.objectweb.asm.ClassVisitor#visitField} or {@link - * jdk.internal.org.objectweb.asm.MethodVisitor#visitLocalVariable} methods. + * org.objectweb.asm.ClassVisitor#visitField} or {@link + * org.objectweb.asm.MethodVisitor#visitLocalVariable} methods. * * @param signatureVisitor the visitor that must visit this signature. */ diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/signature/SignatureVisitor.java similarity index 98% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/signature/SignatureVisitor.java index 5be537ba307..b4156f06e76 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/signature/SignatureVisitor.java @@ -57,9 +57,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.signature; +package org.objectweb.asm.signature; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.Opcodes; /** * A visitor to visit a generic signature. The methods of this interface must be called in one of @@ -212,7 +212,7 @@ public abstract class SignatureVisitor { * Starts the visit of a signature corresponding to a class or interface type. * * @param name the internal name of the class or interface (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * org.objectweb.asm.Type#getInternalName()}). */ public void visitClassType(final String name) {} diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/signature/SignatureWriter.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/signature/SignatureWriter.java index 077a9292955..d22027dfab9 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/signature/SignatureWriter.java @@ -57,9 +57,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.signature; +package org.objectweb.asm.signature; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.Opcodes; /** * A SignatureVisitor that generates signature literals, as defined in the Java Virtual Machine diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/AbstractInsnNode.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/AbstractInsnNode.java index 1b22e023abc..169efcbea66 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/AbstractInsnNode.java @@ -57,12 +57,12 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.ArrayList; import java.util.List; import java.util.Map; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.MethodVisitor; /** * A node that represents a bytecode instruction. An instruction can appear at most once in at diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/AnnotationNode.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/AnnotationNode.java index 2ef0bcfb624..70036ed2e89 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/AnnotationNode.java @@ -57,12 +57,12 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.ArrayList; import java.util.List; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Opcodes; /** * A node that represents an annotation. @@ -78,7 +78,7 @@ public class AnnotationNode extends AnnotationVisitor { * The name value pairs of this annotation. Each name value pair is stored as two consecutive * elements in the list. The name is a {@link String}, and the value may be a {@link Byte}, {@link * Boolean}, {@link Character}, {@link Short}, {@link Integer}, {@link Long}, {@link Float}, - * {@link Double}, {@link String} or {@link jdk.internal.org.objectweb.asm.Type}, or a two elements String + * {@link Double}, {@link String} or {@link org.objectweb.asm.Type}, or a two elements String * array (for enumeration values), an {@link AnnotationNode}, or a {@link List} of values of one * of the preceding types. The list may be {@literal null} if there is no name value pair. */ diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ClassNode.java similarity index 93% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ClassNode.java index 0e271d6a159..a5c73b63f3c 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ClassNode.java @@ -57,19 +57,19 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.ArrayList; import java.util.List; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.Attribute; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.FieldVisitor; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.ModuleVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.RecordComponentVisitor; -import jdk.internal.org.objectweb.asm.TypePath; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Attribute; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.ModuleVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.RecordComponentVisitor; +import org.objectweb.asm.TypePath; /** * A node that represents a class. @@ -85,19 +85,19 @@ public class ClassNode extends ClassVisitor { public int version; /** - * The class's access flags (see {@link jdk.internal.org.objectweb.asm.Opcodes}). This field also indicates if + * The class's access flags (see {@link org.objectweb.asm.Opcodes}). This field also indicates if * the class is deprecated {@link Opcodes#ACC_DEPRECATED} or a record {@link Opcodes#ACC_RECORD}. */ public int access; - /** The internal name of this class (see {@link jdk.internal.org.objectweb.asm.Type#getInternalName()}). */ + /** The internal name of this class (see {@link org.objectweb.asm.Type#getInternalName()}). */ public String name; /** The signature of this class. May be {@literal null}. */ public String signature; /** - * The internal of name of the super class (see {@link jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * The internal of name of the super class (see {@link org.objectweb.asm.Type#getInternalName()}). * For interfaces, the super class is {@link Object}. May be {@literal null}, but only for the * {@link Object} class. */ @@ -105,7 +105,7 @@ public class ClassNode extends ClassVisitor { /** * The internal names of the interfaces directly implemented by this class (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * org.objectweb.asm.Type#getInternalName()}). */ public List interfaces; @@ -122,7 +122,7 @@ public class ClassNode extends ClassVisitor { /** * The internal name of the enclosing class of this class (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). Must be {@literal null} if this class has no + * org.objectweb.asm.Type#getInternalName()}). Must be {@literal null} if this class has no * enclosing class, or if it is a local or anonymous class. */ public String outerClass; @@ -163,19 +163,19 @@ public class ClassNode extends ClassVisitor { /** * The internal name of the nest host class of this class (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. + * org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. */ public String nestHostClass; /** * The internal names of the nest members of this class (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. + * org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. */ public List nestMembers; /** * The internal names of the permitted subclasses of this class (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. + * org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. */ public List permittedSubclasses; diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/FieldInsnNode.java similarity index 91% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/FieldInsnNode.java index ce450f9107b..7257639fc6b 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/FieldInsnNode.java @@ -57,10 +57,10 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.Map; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.MethodVisitor; /** * A node that represents a field instruction. A field instruction is an instruction that loads or @@ -72,14 +72,14 @@ public class FieldInsnNode extends AbstractInsnNode { /** * The internal name of the field's owner class (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * org.objectweb.asm.Type#getInternalName()}). */ public String owner; /** The field's name. */ public String name; - /** The field's descriptor (see {@link jdk.internal.org.objectweb.asm.Type}). */ + /** The field's descriptor (see {@link org.objectweb.asm.Type}). */ public String desc; /** @@ -88,9 +88,9 @@ public class FieldInsnNode extends AbstractInsnNode { * @param opcode the opcode of the type instruction to be constructed. This opcode must be * GETSTATIC, PUTSTATIC, GETFIELD or PUTFIELD. * @param owner the internal name of the field's owner class (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * org.objectweb.asm.Type#getInternalName()}). * @param name the field's name. - * @param descriptor the field's descriptor (see {@link jdk.internal.org.objectweb.asm.Type}). + * @param descriptor the field's descriptor (see {@link org.objectweb.asm.Type}). */ public FieldInsnNode( final int opcode, final String owner, final String name, final String descriptor) { diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/FieldNode.java similarity index 91% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/FieldNode.java index 2bf3682b669..60c36905ae2 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/FieldNode.java @@ -57,15 +57,15 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.List; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.Attribute; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.FieldVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.TypePath; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Attribute; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.TypePath; /** * A node that represents a field. @@ -75,7 +75,7 @@ import jdk.internal.org.objectweb.asm.TypePath; public class FieldNode extends FieldVisitor { /** - * The field's access flags (see {@link jdk.internal.org.objectweb.asm.Opcodes}). This field also indicates if + * The field's access flags (see {@link org.objectweb.asm.Opcodes}). This field also indicates if * the field is synthetic and/or deprecated. */ public int access; @@ -83,7 +83,7 @@ public class FieldNode extends FieldVisitor { /** The field's name. */ public String name; - /** The field's descriptor (see {@link jdk.internal.org.objectweb.asm.Type}). */ + /** The field's descriptor (see {@link org.objectweb.asm.Type}). */ public String desc; /** The field's signature. May be {@literal null}. */ @@ -115,10 +115,10 @@ public class FieldNode extends FieldVisitor { * Constructs a new {@link FieldNode}. Subclasses must not use this constructor. Instead, * they must use the {@link #FieldNode(int, int, String, String, String, Object)} version. * - * @param access the field's access flags (see {@link jdk.internal.org.objectweb.asm.Opcodes}). This parameter + * @param access the field's access flags (see {@link org.objectweb.asm.Opcodes}). This parameter * also indicates if the field is synthetic and/or deprecated. * @param name the field's name. - * @param descriptor the field's descriptor (see {@link jdk.internal.org.objectweb.asm.Type}). + * @param descriptor the field's descriptor (see {@link org.objectweb.asm.Type}). * @param signature the field's signature. * @param value the field's initial value. This parameter, which may be {@literal null} if the * field does not have an initial value, must be an {@link Integer}, a {@link Float}, a {@link @@ -142,10 +142,10 @@ public class FieldNode extends FieldVisitor { * * @param api the ASM API version implemented by this visitor. Must be one of the {@code * ASM}x values in {@link Opcodes}. - * @param access the field's access flags (see {@link jdk.internal.org.objectweb.asm.Opcodes}). This parameter + * @param access the field's access flags (see {@link org.objectweb.asm.Opcodes}). This parameter * also indicates if the field is synthetic and/or deprecated. * @param name the field's name. - * @param descriptor the field's descriptor (see {@link jdk.internal.org.objectweb.asm.Type}). + * @param descriptor the field's descriptor (see {@link org.objectweb.asm.Type}). * @param signature the field's signature. * @param value the field's initial value. This parameter, which may be {@literal null} if the * field does not have an initial value, must be an {@link Integer}, a {@link Float}, a {@link diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/FrameNode.java similarity index 98% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/FrameNode.java index cb8c8fb05ab..e60fce6830d 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/FrameNode.java @@ -57,13 +57,13 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.ArrayList; import java.util.List; import java.util.Map; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; /** * A node that represents a stack map frame. These nodes are pseudo instruction nodes in order to be diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/IincInsnNode.java similarity index 96% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/IincInsnNode.java index 864d540cd8c..452a5c6875f 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/IincInsnNode.java @@ -57,11 +57,11 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.Map; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; /** * A node that represents an IINC instruction. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/InnerClassNode.java similarity index 90% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/InnerClassNode.java index a2e103ae6d2..c1d713cfdcc 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/InnerClassNode.java @@ -57,9 +57,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; -import jdk.internal.org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassVisitor; /** * A node that represents an inner class. This inner class is not necessarily a member of the {@link @@ -72,12 +72,12 @@ import jdk.internal.org.objectweb.asm.ClassVisitor; */ public class InnerClassNode { - /** The internal name of an inner class (see {@link jdk.internal.org.objectweb.asm.Type#getInternalName()}). */ + /** The internal name of an inner class (see {@link org.objectweb.asm.Type#getInternalName()}). */ public String name; /** * The internal name of the class to which the inner class belongs (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. + * org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. */ public String outerName; @@ -96,9 +96,9 @@ public class InnerClassNode { /** * Constructs a new {@link InnerClassNode} for an inner class C. * - * @param name the internal name of C (see {@link jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * @param name the internal name of C (see {@link org.objectweb.asm.Type#getInternalName()}). * @param outerName the internal name of the class or interface C is a member of (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). Must be {@literal null} if C is not the member + * org.objectweb.asm.Type#getInternalName()}). Must be {@literal null} if C is not the member * of a class or interface (e.g. for local or anonymous classes). * @param innerName the (simple) name of C. Must be {@literal null} for anonymous inner classes. * @param access the access flags of C originally declared in the source code from which this diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/InsnList.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/InsnList.java index a63c80d7603..94170c0c81f 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/InsnList.java @@ -57,11 +57,11 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.ListIterator; import java.util.NoSuchElementException; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.MethodVisitor; /** * A doubly linked list of {@link AbstractInsnNode} objects. This implementation is not thread diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/InsnNode.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/InsnNode.java index 94e043ca9c4..50f51533b85 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/InsnNode.java @@ -57,10 +57,10 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.Map; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.MethodVisitor; /** * A node that represents a zero operand instruction. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/IntInsnNode.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/IntInsnNode.java index 0c044886f90..c1acc42898d 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/IntInsnNode.java @@ -57,10 +57,10 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.Map; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.MethodVisitor; /** * A node that represents an instruction with a single int operand. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/InvokeDynamicInsnNode.java similarity index 90% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/InvokeDynamicInsnNode.java index 087d3f5acd4..66351132edc 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/InvokeDynamicInsnNode.java @@ -57,12 +57,12 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.Map; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.Handle; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; /** * A node that represents an invokedynamic instruction. @@ -74,7 +74,7 @@ public class InvokeDynamicInsnNode extends AbstractInsnNode { /** The method's name. */ public String name; - /** The method's descriptor (see {@link jdk.internal.org.objectweb.asm.Type}). */ + /** The method's descriptor (see {@link org.objectweb.asm.Type}). */ public String desc; /** The bootstrap method. */ @@ -87,11 +87,11 @@ public class InvokeDynamicInsnNode extends AbstractInsnNode { * Constructs a new {@link InvokeDynamicInsnNode}. * * @param name the method's name. - * @param descriptor the method's descriptor (see {@link jdk.internal.org.objectweb.asm.Type}). + * @param descriptor the method's descriptor (see {@link org.objectweb.asm.Type}). * @param bootstrapMethodHandle the bootstrap method. * @param bootstrapMethodArguments the bootstrap method constant arguments. Each argument must be * an {@link Integer}, {@link Float}, {@link Long}, {@link Double}, {@link String}, {@link - * jdk.internal.org.objectweb.asm.Type} or {@link Handle} value. This method is allowed to modify the + * org.objectweb.asm.Type} or {@link Handle} value. This method is allowed to modify the * content of the array so a caller should expect that this array may change. */ public InvokeDynamicInsnNode( diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/JumpInsnNode.java similarity index 98% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/JumpInsnNode.java index 23891297e45..17fb3f82587 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/JumpInsnNode.java @@ -57,10 +57,10 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.Map; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.MethodVisitor; /** * A node that represents a jump instruction. A jump instruction is an instruction that may jump to diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/LabelNode.java similarity index 96% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/LabelNode.java index 935382ad543..5c6c696ff62 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/LabelNode.java @@ -57,11 +57,11 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.Map; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; /** An {@link AbstractInsnNode} that encapsulates a {@link Label}. */ public class LabelNode extends AbstractInsnNode { diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/LdcInsnNode.java similarity index 94% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/LdcInsnNode.java index 1dac0b7aa85..35d86cb8c33 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/LdcInsnNode.java @@ -57,14 +57,14 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.Map; -import jdk.internal.org.objectweb.asm.ConstantDynamic; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; +import org.objectweb.asm.ConstantDynamic; +import org.objectweb.asm.Handle; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; /** * A node that represents an LDC instruction. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/LineNumberNode.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/LineNumberNode.java index 4feb13072b5..be06a08f020 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/LineNumberNode.java @@ -57,10 +57,10 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.Map; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.MethodVisitor; /** * A node that represents a line number declaration. These nodes are pseudo instruction nodes in diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/LocalVariableAnnotationNode.java similarity index 95% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/LocalVariableAnnotationNode.java index 2a593ca1699..a9bd2007cc5 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/LocalVariableAnnotationNode.java @@ -57,13 +57,13 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.List; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.TypePath; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.TypePath; /** * A node that represents a type annotation on a local or resource variable. @@ -96,7 +96,7 @@ public class LocalVariableAnnotationNode extends TypeAnnotationNode { * constructor. Instead, they must use the {@link #LocalVariableAnnotationNode(int, TypePath, * LabelNode[], LabelNode[], int[], String)} version. * - * @param typeRef a reference to the annotated type. See {@link jdk.internal.org.objectweb.asm.TypeReference}. + * @param typeRef a reference to the annotated type. See {@link org.objectweb.asm.TypeReference}. * @param typePath the path to the annotated type argument, wildcard bound, array element type, or * static inner type within 'typeRef'. May be {@literal null} if the annotation targets * 'typeRef' as a whole. @@ -123,7 +123,7 @@ public class LocalVariableAnnotationNode extends TypeAnnotationNode { * * @param api the ASM API version implemented by this visitor. Must be one of the {@code * ASM}x values in {@link Opcodes}. - * @param typeRef a reference to the annotated type. See {@link jdk.internal.org.objectweb.asm.TypeReference}. + * @param typeRef a reference to the annotated type. See {@link org.objectweb.asm.TypeReference}. * @param start the fist instructions corresponding to the continuous ranges that make the scope * of this local variable (inclusive). * @param end the last instructions corresponding to the continuous ranges that make the scope of diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/LocalVariableNode.java similarity index 98% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/LocalVariableNode.java index 7bfb121b88a..147bc31bc9e 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/LocalVariableNode.java @@ -57,9 +57,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.MethodVisitor; /** * A node that represents a local variable declaration. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.java similarity index 96% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.java index 31d3c79b162..80dbe11a6b6 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.java @@ -57,13 +57,13 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.List; import java.util.Map; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; /** * A node that represents a LOOKUPSWITCH instruction. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/MethodInsnNode.java similarity index 90% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/MethodInsnNode.java index 77e720b69b9..bff6d1f341f 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/MethodInsnNode.java @@ -57,11 +57,11 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.Map; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; /** * A node that represents a method instruction. A method instruction is an instruction that invokes @@ -73,7 +73,7 @@ public class MethodInsnNode extends AbstractInsnNode { /** * The internal name of the method's owner class (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * org.objectweb.asm.Type#getInternalName()}). * *

    For methods of arrays, e.g., {@code clone()}, the array type descriptor. */ @@ -82,7 +82,7 @@ public class MethodInsnNode extends AbstractInsnNode { /** The method's name. */ public String name; - /** The method's descriptor (see {@link jdk.internal.org.objectweb.asm.Type}). */ + /** The method's descriptor (see {@link org.objectweb.asm.Type}). */ public String desc; /** Whether the method's owner class if an interface. */ @@ -94,9 +94,9 @@ public class MethodInsnNode extends AbstractInsnNode { * @param opcode the opcode of the type instruction to be constructed. This opcode must be * INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC or INVOKEINTERFACE. * @param owner the internal name of the method's owner class (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * org.objectweb.asm.Type#getInternalName()}). * @param name the method's name. - * @param descriptor the method's descriptor (see {@link jdk.internal.org.objectweb.asm.Type}). + * @param descriptor the method's descriptor (see {@link org.objectweb.asm.Type}). */ public MethodInsnNode( final int opcode, final String owner, final String name, final String descriptor) { @@ -109,9 +109,9 @@ public class MethodInsnNode extends AbstractInsnNode { * @param opcode the opcode of the type instruction to be constructed. This opcode must be * INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC or INVOKEINTERFACE. * @param owner the internal name of the method's owner class (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * org.objectweb.asm.Type#getInternalName()}). * @param name the method's name. - * @param descriptor the method's descriptor (see {@link jdk.internal.org.objectweb.asm.Type}). + * @param descriptor the method's descriptor (see {@link org.objectweb.asm.Type}). * @param isInterface if the method's owner class is an interface. */ public MethodInsnNode( diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/MethodNode.java similarity index 98% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/MethodNode.java index 3ec2ac6d1fc..4c265d44290 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/MethodNode.java @@ -57,20 +57,20 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.ArrayList; import java.util.List; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.Attribute; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.ConstantDynamic; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; -import jdk.internal.org.objectweb.asm.TypePath; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Attribute; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ConstantDynamic; +import org.objectweb.asm.Handle; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; +import org.objectweb.asm.TypePath; /** * A node that represents a method. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleExportNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ModuleExportNode.java similarity index 93% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleExportNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ModuleExportNode.java index b845ebe662e..9cd806aa531 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleExportNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ModuleExportNode.java @@ -57,10 +57,10 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.List; -import jdk.internal.org.objectweb.asm.ModuleVisitor; +import org.objectweb.asm.ModuleVisitor; /** * A node that represents an exported package with its name and the module that can access to it. @@ -71,12 +71,12 @@ public class ModuleExportNode { /** * The internal name of the exported package (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * org.objectweb.asm.Type#getInternalName()}). */ public String packaze; /** - * The access flags (see {@link jdk.internal.org.objectweb.asm.Opcodes}). Valid values are {@code + * The access flags (see {@link org.objectweb.asm.Opcodes}). Valid values are {@code * ACC_SYNTHETIC} and {@code ACC_MANDATED}. */ public int access; @@ -91,7 +91,7 @@ public class ModuleExportNode { * Constructs a new {@link ModuleExportNode}. * * @param packaze the internal name of the exported package (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * org.objectweb.asm.Type#getInternalName()}). * @param access the package access flags, one or more of {@code ACC_SYNTHETIC} and {@code * ACC_MANDATED}. * @param modules a list of modules that can access this exported package, specified with fully diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ModuleNode.java similarity index 94% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ModuleNode.java index 66baee92e1b..d131f6275f8 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ModuleNode.java @@ -57,13 +57,13 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.ArrayList; import java.util.List; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.ModuleVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ModuleVisitor; +import org.objectweb.asm.Opcodes; /** * A node that represents a module declaration. @@ -86,13 +86,13 @@ public class ModuleNode extends ModuleVisitor { /** * The internal name of the main class of this module (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. + * org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. */ public String mainClass; /** * The internal name of the packages declared by this module (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. + * org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. */ public List packages; @@ -107,7 +107,7 @@ public class ModuleNode extends ModuleVisitor { /** * The internal names of the services used by this module (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. + * org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. */ public List uses; @@ -148,7 +148,7 @@ public class ModuleNode extends ModuleVisitor { * @param exports The packages exported by this module. May be {@literal null}. * @param opens The packages opened by this module. May be {@literal null}. * @param uses The internal names of the services used by this module (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. + * org.objectweb.asm.Type#getInternalName()}). May be {@literal null}. * @param provides The services provided by this module. May be {@literal null}. */ public ModuleNode( diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleOpenNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ModuleOpenNode.java similarity index 94% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleOpenNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ModuleOpenNode.java index abe48f598db..83682776737 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleOpenNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ModuleOpenNode.java @@ -57,10 +57,10 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.List; -import jdk.internal.org.objectweb.asm.ModuleVisitor; +import org.objectweb.asm.ModuleVisitor; /** * A node that represents an opened package with its name and the module that can access it. @@ -70,7 +70,7 @@ import jdk.internal.org.objectweb.asm.ModuleVisitor; public class ModuleOpenNode { /** - * The internal name of the opened package (see {@link jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * The internal name of the opened package (see {@link org.objectweb.asm.Type#getInternalName()}). */ public String packaze; @@ -90,7 +90,7 @@ public class ModuleOpenNode { * Constructs a new {@link ModuleOpenNode}. * * @param packaze the internal name of the opened package (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * org.objectweb.asm.Type#getInternalName()}). * @param access the access flag of the opened package, valid values are among {@code * ACC_SYNTHETIC} and {@code ACC_MANDATED}. * @param modules the fully qualified names (using dots) of the modules that can use deep diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleProvideNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ModuleProvideNode.java similarity index 91% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleProvideNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ModuleProvideNode.java index d48239f55b2..31cbe669ef8 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleProvideNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ModuleProvideNode.java @@ -57,10 +57,10 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.List; -import jdk.internal.org.objectweb.asm.ModuleVisitor; +import org.objectweb.asm.ModuleVisitor; /** * A node that represents a service and its implementation provided by the current module. @@ -69,12 +69,12 @@ import jdk.internal.org.objectweb.asm.ModuleVisitor; */ public class ModuleProvideNode { - /** The internal name of the service (see {@link jdk.internal.org.objectweb.asm.Type#getInternalName()}). */ + /** The internal name of the service (see {@link org.objectweb.asm.Type#getInternalName()}). */ public String service; /** * The internal names of the implementations of the service (there is at least one provider). See - * {@link jdk.internal.org.objectweb.asm.Type#getInternalName()}. + * {@link org.objectweb.asm.Type#getInternalName()}. */ public List providers; @@ -83,7 +83,7 @@ public class ModuleProvideNode { * * @param service the internal name of the service. * @param providers the internal names of the implementations of the service (there is at least - * one provider). See {@link jdk.internal.org.objectweb.asm.Type#getInternalName()}. + * one provider). See {@link org.objectweb.asm.Type#getInternalName()}. */ public ModuleProvideNode(final String service, final List providers) { this.service = service; diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleRequireNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ModuleRequireNode.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleRequireNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ModuleRequireNode.java index 319d7af23e3..e188860beec 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleRequireNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ModuleRequireNode.java @@ -57,9 +57,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; -import jdk.internal.org.objectweb.asm.ModuleVisitor; +import org.objectweb.asm.ModuleVisitor; /** * A node that represents a required module with its name and access of a module descriptor. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java similarity index 92% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java index 87a00b69021..a94a9d8c355 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java @@ -57,11 +57,11 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.Map; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; /** * A node that represents a MULTIANEWARRAY instruction. @@ -70,7 +70,7 @@ import jdk.internal.org.objectweb.asm.Opcodes; */ public class MultiANewArrayInsnNode extends AbstractInsnNode { - /** An array type descriptor (see {@link jdk.internal.org.objectweb.asm.Type}). */ + /** An array type descriptor (see {@link org.objectweb.asm.Type}). */ public String desc; /** Number of dimensions of the array to allocate. */ @@ -79,7 +79,7 @@ public class MultiANewArrayInsnNode extends AbstractInsnNode { /** * Constructs a new {@link MultiANewArrayInsnNode}. * - * @param descriptor an array type descriptor (see {@link jdk.internal.org.objectweb.asm.Type}). + * @param descriptor an array type descriptor (see {@link org.objectweb.asm.Type}). * @param numDimensions the number of dimensions of the array to allocate. */ public MultiANewArrayInsnNode(final String descriptor, final int numDimensions) { diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ParameterNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ParameterNode.java similarity index 93% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ParameterNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ParameterNode.java index a2223c8c367..e5d60a16bca 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ParameterNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/ParameterNode.java @@ -57,9 +57,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.MethodVisitor; /** * A node that represents a parameter of a method. @@ -72,7 +72,7 @@ public class ParameterNode { public String name; /** - * The parameter's access flags (see {@link jdk.internal.org.objectweb.asm.Opcodes}). Valid values are {@code + * The parameter's access flags (see {@link org.objectweb.asm.Opcodes}). Valid values are {@code * ACC_FINAL}, {@code ACC_SYNTHETIC} and {@code ACC_MANDATED}. */ public int access; @@ -81,7 +81,7 @@ public class ParameterNode { * Constructs a new {@link ParameterNode}. * * @param access The parameter's access flags. Valid values are {@code ACC_FINAL}, {@code - * ACC_SYNTHETIC} or/and {@code ACC_MANDATED} (see {@link jdk.internal.org.objectweb.asm.Opcodes}). + * ACC_SYNTHETIC} or/and {@code ACC_MANDATED} (see {@link org.objectweb.asm.Opcodes}). * @param name the parameter's name. */ public ParameterNode(final String name, final int access) { diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/RecordComponentNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/RecordComponentNode.java similarity index 94% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/RecordComponentNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/RecordComponentNode.java index 7cc87a7776e..0bbc48ad821 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/RecordComponentNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/RecordComponentNode.java @@ -57,15 +57,15 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.List; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.Attribute; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.RecordComponentVisitor; -import jdk.internal.org.objectweb.asm.TypePath; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Attribute; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.RecordComponentVisitor; +import org.objectweb.asm.TypePath; /** * A node that represents a record component. @@ -77,7 +77,7 @@ public class RecordComponentNode extends RecordComponentVisitor { /** The record component name. */ public String name; - /** The record component descriptor (see {@link jdk.internal.org.objectweb.asm.Type}). */ + /** The record component descriptor (see {@link org.objectweb.asm.Type}). */ public String descriptor; /** The record component signature. May be {@literal null}. */ @@ -103,7 +103,7 @@ public class RecordComponentNode extends RecordComponentVisitor { * Instead, they must use the {@link #RecordComponentNode(int, String, String, String)} version. * * @param name the record component name. - * @param descriptor the record component descriptor (see {@link jdk.internal.org.objectweb.asm.Type}). + * @param descriptor the record component descriptor (see {@link org.objectweb.asm.Type}). * @param signature the record component signature. * @throws IllegalStateException If a subclass calls this constructor. */ @@ -120,7 +120,7 @@ public class RecordComponentNode extends RecordComponentVisitor { * @param api the ASM API version implemented by this visitor. Must be one of {@link Opcodes#ASM8} * or {@link Opcodes#ASM9}. * @param name the record component name. - * @param descriptor the record component descriptor (see {@link jdk.internal.org.objectweb.asm.Type}). + * @param descriptor the record component descriptor (see {@link org.objectweb.asm.Type}). * @param signature the record component signature. */ public RecordComponentNode( diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/TableSwitchInsnNode.java similarity index 96% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/TableSwitchInsnNode.java index 94287b55c1c..58bb3648f72 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/TableSwitchInsnNode.java @@ -57,13 +57,13 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.List; import java.util.Map; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; /** * A node that represents a TABLESWITCH instruction. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/TryCatchBlockNode.java similarity index 96% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/TryCatchBlockNode.java index 2095218ab0b..495e989bc8d 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/TryCatchBlockNode.java @@ -57,10 +57,10 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.List; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.MethodVisitor; /** * A node that represents a try catch block. @@ -99,7 +99,7 @@ public class TryCatchBlockNode { * @param end the end of the exception handler's scope (exclusive). * @param handler the beginning of the exception handler's code. * @param type the internal name of the type of exceptions handled by the handler (see {@link - * jdk.internal.org.objectweb.asm.Type#getInternalName()}), or {@literal null} to catch any exceptions (for + * org.objectweb.asm.Type#getInternalName()}), or {@literal null} to catch any exceptions (for * "finally" blocks). */ public TryCatchBlockNode( diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeAnnotationNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/TypeAnnotationNode.java similarity index 93% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeAnnotationNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/TypeAnnotationNode.java index 7a6bbb201f3..bdf79a84d86 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeAnnotationNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/TypeAnnotationNode.java @@ -57,10 +57,10 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.TypePath; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.TypePath; /** * A node that represents a type annotation. @@ -69,7 +69,7 @@ import jdk.internal.org.objectweb.asm.TypePath; */ public class TypeAnnotationNode extends AnnotationNode { - /** A reference to the annotated type. See {@link jdk.internal.org.objectweb.asm.TypeReference}. */ + /** A reference to the annotated type. See {@link org.objectweb.asm.TypeReference}. */ public int typeRef; /** @@ -83,7 +83,7 @@ public class TypeAnnotationNode extends AnnotationNode { * Constructs a new {@link AnnotationNode}. Subclasses must not use this constructor. * Instead, they must use the {@link #TypeAnnotationNode(int, int, TypePath, String)} version. * - * @param typeRef a reference to the annotated type. See {@link jdk.internal.org.objectweb.asm.TypeReference}. + * @param typeRef a reference to the annotated type. See {@link org.objectweb.asm.TypeReference}. * @param typePath the path to the annotated type argument, wildcard bound, array element type, or * static inner type within 'typeRef'. May be {@literal null} if the annotation targets * 'typeRef' as a whole. @@ -102,7 +102,7 @@ public class TypeAnnotationNode extends AnnotationNode { * * @param api the ASM API version implemented by this visitor. Must be one of the {@code * ASM}x values in {@link Opcodes}. - * @param typeRef a reference to the annotated type. See {@link jdk.internal.org.objectweb.asm.TypeReference}. + * @param typeRef a reference to the annotated type. See {@link org.objectweb.asm.TypeReference}. * @param typePath the path to the annotated type argument, wildcard bound, array element type, or * static inner type within 'typeRef'. May be {@literal null} if the annotation targets * 'typeRef' as a whole. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/TypeInsnNode.java similarity index 92% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/TypeInsnNode.java index ba01f50efc1..419e3f4e3dc 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/TypeInsnNode.java @@ -57,14 +57,14 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.Map; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.MethodVisitor; /** * A node that represents a type instruction. A type instruction is an instruction which takes an - * internal name as parameter (see {@link jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * internal name as parameter (see {@link org.objectweb.asm.Type#getInternalName()}). * * @author Eric Bruneton */ @@ -72,7 +72,7 @@ public class TypeInsnNode extends AbstractInsnNode { /** * The operand of this instruction. Despite its name (due to historical reasons), this operand is - * an internal name (see {@link jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * an internal name (see {@link org.objectweb.asm.Type#getInternalName()}). */ public String desc; @@ -82,7 +82,7 @@ public class TypeInsnNode extends AbstractInsnNode { * @param opcode the opcode of the type instruction to be constructed. This opcode must be NEW, * ANEWARRAY, CHECKCAST or INSTANCEOF. * @param type the operand of the instruction to be constructed. This operand is an internal name - * (see {@link jdk.internal.org.objectweb.asm.Type#getInternalName()}). + * (see {@link org.objectweb.asm.Type#getInternalName()}). */ public TypeInsnNode(final int opcode, final String type) { super(opcode); diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/UnsupportedClassVersionException.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/UnsupportedClassVersionException.java similarity index 98% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/UnsupportedClassVersionException.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/UnsupportedClassVersionException.java index ec9c9d04bb6..125aa8f98d5 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/UnsupportedClassVersionException.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/UnsupportedClassVersionException.java @@ -56,7 +56,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; /** * Exception thrown in {@link AnnotationNode#check}, {@link ClassNode#check}, {@link diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/Util.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/Util.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/Util.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/Util.java index ae09e55a2d6..32800364681 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/Util.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/Util.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.ArrayList; import java.util.List; diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/VarInsnNode.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/VarInsnNode.java index 8e0ddfe8b40..d1a14367a60 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/VarInsnNode.java @@ -57,10 +57,10 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree; +package org.objectweb.asm.tree; import java.util.Map; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.MethodVisitor; /** * A node that represents a local variable instruction. A local variable instruction is an diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/Analyzer.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/Analyzer.java index a3c277e69f1..0c2f33e2523 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/Analyzer.java @@ -57,24 +57,24 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree.analysis; +package org.objectweb.asm.tree.analysis; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; -import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode; -import jdk.internal.org.objectweb.asm.tree.IincInsnNode; -import jdk.internal.org.objectweb.asm.tree.InsnList; -import jdk.internal.org.objectweb.asm.tree.JumpInsnNode; -import jdk.internal.org.objectweb.asm.tree.LabelNode; -import jdk.internal.org.objectweb.asm.tree.LookupSwitchInsnNode; -import jdk.internal.org.objectweb.asm.tree.MethodNode; -import jdk.internal.org.objectweb.asm.tree.TableSwitchInsnNode; -import jdk.internal.org.objectweb.asm.tree.TryCatchBlockNode; -import jdk.internal.org.objectweb.asm.tree.VarInsnNode; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.IincInsnNode; +import org.objectweb.asm.tree.InsnList; +import org.objectweb.asm.tree.JumpInsnNode; +import org.objectweb.asm.tree.LabelNode; +import org.objectweb.asm.tree.LookupSwitchInsnNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.TableSwitchInsnNode; +import org.objectweb.asm.tree.TryCatchBlockNode; +import org.objectweb.asm.tree.VarInsnNode; /** * A semantic bytecode analyzer. This class does not fully check that JSR and RET instructions diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java index 5101b2f534a..61e4afeb9d4 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java @@ -57,9 +57,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree.analysis; +package org.objectweb.asm.tree.analysis; -import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.AbstractInsnNode; /** * An exception thrown if a problem occurs during the analysis of a method. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.java similarity index 95% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.java index 7dee3af4405..4be7b111b28 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.java @@ -57,21 +57,21 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree.analysis; +package org.objectweb.asm.tree.analysis; import java.util.List; -import jdk.internal.org.objectweb.asm.ConstantDynamic; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; -import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode; -import jdk.internal.org.objectweb.asm.tree.FieldInsnNode; -import jdk.internal.org.objectweb.asm.tree.IntInsnNode; -import jdk.internal.org.objectweb.asm.tree.InvokeDynamicInsnNode; -import jdk.internal.org.objectweb.asm.tree.LdcInsnNode; -import jdk.internal.org.objectweb.asm.tree.MethodInsnNode; -import jdk.internal.org.objectweb.asm.tree.MultiANewArrayInsnNode; -import jdk.internal.org.objectweb.asm.tree.TypeInsnNode; +import org.objectweb.asm.ConstantDynamic; +import org.objectweb.asm.Handle; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.FieldInsnNode; +import org.objectweb.asm.tree.IntInsnNode; +import org.objectweb.asm.tree.InvokeDynamicInsnNode; +import org.objectweb.asm.tree.LdcInsnNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MultiANewArrayInsnNode; +import org.objectweb.asm.tree.TypeInsnNode; /** * An {@link Interpreter} for {@link BasicValue} values. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/BasicValue.java similarity index 98% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/BasicValue.java index 3d854f63686..103bc2d1ef7 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/BasicValue.java @@ -57,9 +57,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree.analysis; +package org.objectweb.asm.tree.analysis; -import jdk.internal.org.objectweb.asm.Type; +import org.objectweb.asm.Type; /** * A {@link Value} that is represented with its type in a seven types type system. This type system diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java index ebe738fe420..e288657fa0e 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java @@ -57,15 +57,15 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree.analysis; +package org.objectweb.asm.tree.analysis; import java.util.List; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; -import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode; -import jdk.internal.org.objectweb.asm.tree.FieldInsnNode; -import jdk.internal.org.objectweb.asm.tree.InvokeDynamicInsnNode; -import jdk.internal.org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.FieldInsnNode; +import org.objectweb.asm.tree.InvokeDynamicInsnNode; +import org.objectweb.asm.tree.MethodInsnNode; /** * An extended {@link BasicInterpreter} that checks that bytecode instructions are correctly used. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/Frame.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/Frame.java index 5940c9ed91a..92fa234dc43 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/Frame.java @@ -57,19 +57,19 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree.analysis; +package org.objectweb.asm.tree.analysis; import java.util.ArrayList; import java.util.List; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; -import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode; -import jdk.internal.org.objectweb.asm.tree.IincInsnNode; -import jdk.internal.org.objectweb.asm.tree.InvokeDynamicInsnNode; -import jdk.internal.org.objectweb.asm.tree.LabelNode; -import jdk.internal.org.objectweb.asm.tree.MethodInsnNode; -import jdk.internal.org.objectweb.asm.tree.MultiANewArrayInsnNode; -import jdk.internal.org.objectweb.asm.tree.VarInsnNode; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.IincInsnNode; +import org.objectweb.asm.tree.InvokeDynamicInsnNode; +import org.objectweb.asm.tree.LabelNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MultiANewArrayInsnNode; +import org.objectweb.asm.tree.VarInsnNode; /** * A symbolic execution stack frame. A stack frame contains a set of local variable slots, and an @@ -162,7 +162,7 @@ public class Frame { /** * Initializes a frame corresponding to the target or to the successor of a jump instruction. This - * method is called by {@link Analyzer#analyze(String, jdk.internal.org.objectweb.asm.tree.MethodNode)} while + * method is called by {@link Analyzer#analyze(String, org.objectweb.asm.tree.MethodNode)} while * interpreting jump instructions. It is called once for each possible target of the jump * instruction, and once for its successor instruction (except for GOTO and JSR), before the frame * is merged with the existing frame at this location. The default implementation of this method diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/Interpreter.java similarity index 98% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/Interpreter.java index d2c6103b77e..aedcaf07def 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/Interpreter.java @@ -57,13 +57,13 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree.analysis; +package org.objectweb.asm.tree.analysis; import java.util.List; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; -import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode; -import jdk.internal.org.objectweb.asm.tree.TryCatchBlockNode; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.TryCatchBlockNode; /** * A semantic bytecode interpreter. More precisely, this interpreter only manages the computation of diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.java index 6f2f124ab31..7743853ef19 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.java @@ -57,11 +57,11 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree.analysis; +package org.objectweb.asm.tree.analysis; import java.util.List; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; /** * An extended {@link BasicVerifier} that performs more precise verifications. This verifier diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/SmallSet.java similarity index 99% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/SmallSet.java index 3c85d565ef8..493c53c340c 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/SmallSet.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree.analysis; +package org.objectweb.asm.tree.analysis; import java.util.AbstractSet; import java.util.HashSet; diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/SourceInterpreter.java similarity index 95% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/SourceInterpreter.java index d92ffce0a59..1c8ecbb826c 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/SourceInterpreter.java @@ -57,18 +57,18 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree.analysis; +package org.objectweb.asm.tree.analysis; import java.util.HashSet; import java.util.List; import java.util.Set; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; -import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode; -import jdk.internal.org.objectweb.asm.tree.FieldInsnNode; -import jdk.internal.org.objectweb.asm.tree.InvokeDynamicInsnNode; -import jdk.internal.org.objectweb.asm.tree.LdcInsnNode; -import jdk.internal.org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.FieldInsnNode; +import org.objectweb.asm.tree.InvokeDynamicInsnNode; +import org.objectweb.asm.tree.LdcInsnNode; +import org.objectweb.asm.tree.MethodInsnNode; /** * An {@link Interpreter} for {@link SourceValue} values. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/SourceValue.java similarity index 98% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/SourceValue.java index 5403130af8c..72d91ecefd9 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/SourceValue.java @@ -57,10 +57,10 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree.analysis; +package org.objectweb.asm.tree.analysis; import java.util.Set; -import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.AbstractInsnNode; /** * A {@link Value} which keeps track of the bytecode instructions that can produce it. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/Subroutine.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/Subroutine.java index 67267e0119e..827e4738325 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/Subroutine.java @@ -57,12 +57,12 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree.analysis; +package org.objectweb.asm.tree.analysis; import java.util.ArrayList; import java.util.List; -import jdk.internal.org.objectweb.asm.tree.JumpInsnNode; -import jdk.internal.org.objectweb.asm.tree.LabelNode; +import org.objectweb.asm.tree.JumpInsnNode; +import org.objectweb.asm.tree.LabelNode; /** * A method subroutine (corresponds to a JSR instruction). diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/Value.java similarity index 98% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/Value.java index 7058c959783..2874e5351da 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/analysis/Value.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.tree.analysis; +package org.objectweb.asm.tree.analysis; /** * An immutable symbolic value for the semantic interpretation of bytecode. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/ASMifier.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/ASMifier.java index 074c8029fc2..6681e7c3455 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/ASMifier.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.util; +package org.objectweb.asm.util; import java.io.IOException; import java.io.PrintWriter; @@ -66,13 +66,13 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import jdk.internal.org.objectweb.asm.Attribute; -import jdk.internal.org.objectweb.asm.ConstantDynamic; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; -import jdk.internal.org.objectweb.asm.TypePath; +import org.objectweb.asm.Attribute; +import org.objectweb.asm.ConstantDynamic; +import org.objectweb.asm.Handle; +import org.objectweb.asm.Label; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; +import org.objectweb.asm.TypePath; /** * A {@link Printer} that prints the ASM code to generate the classes it visits. @@ -236,19 +236,19 @@ public class ASMifier extends Printer { simpleName = name.substring(lastSlashIndex + 1).replaceAll("[-\\(\\)]", "_"); } } - text.add("import jdk.internal.org.objectweb.asm.AnnotationVisitor;\n"); - text.add("import jdk.internal.org.objectweb.asm.Attribute;\n"); - text.add("import jdk.internal.org.objectweb.asm.ClassReader;\n"); - text.add("import jdk.internal.org.objectweb.asm.ClassWriter;\n"); - text.add("import jdk.internal.org.objectweb.asm.ConstantDynamic;\n"); - text.add("import jdk.internal.org.objectweb.asm.FieldVisitor;\n"); - text.add("import jdk.internal.org.objectweb.asm.Handle;\n"); - text.add("import jdk.internal.org.objectweb.asm.Label;\n"); - text.add("import jdk.internal.org.objectweb.asm.MethodVisitor;\n"); - text.add("import jdk.internal.org.objectweb.asm.Opcodes;\n"); - text.add("import jdk.internal.org.objectweb.asm.RecordComponentVisitor;\n"); - text.add("import jdk.internal.org.objectweb.asm.Type;\n"); - text.add("import jdk.internal.org.objectweb.asm.TypePath;\n"); + text.add("import org.objectweb.asm.AnnotationVisitor;\n"); + text.add("import org.objectweb.asm.Attribute;\n"); + text.add("import org.objectweb.asm.ClassReader;\n"); + text.add("import org.objectweb.asm.ClassWriter;\n"); + text.add("import org.objectweb.asm.ConstantDynamic;\n"); + text.add("import org.objectweb.asm.FieldVisitor;\n"); + text.add("import org.objectweb.asm.Handle;\n"); + text.add("import org.objectweb.asm.Label;\n"); + text.add("import org.objectweb.asm.MethodVisitor;\n"); + text.add("import org.objectweb.asm.Opcodes;\n"); + text.add("import org.objectweb.asm.RecordComponentVisitor;\n"); + text.add("import org.objectweb.asm.Type;\n"); + text.add("import org.objectweb.asm.TypePath;\n"); text.add("public class " + simpleName + "Dump implements Opcodes {\n\n"); text.add("public static byte[] dump () throws Exception {\n\n"); text.add("ClassWriter classWriter = new ClassWriter(0);\n"); @@ -1200,7 +1200,7 @@ public class ASMifier extends Printer { * Visits a class, field or method type annotation. * * @param typeRef a reference to the annotated type. The sort of this type reference must be - * {@link jdk.internal.org.objectweb.asm.TypeReference#FIELD}. See {@link jdk.internal.org.objectweb.asm.TypeReference}. + * {@link org.objectweb.asm.TypeReference#FIELD}. See {@link org.objectweb.asm.TypeReference}. * @param typePath the path to the annotated type argument, wildcard bound, array element type, or * static inner type within 'typeRef'. May be {@literal null} if the annotation targets * 'typeRef' as a whole. @@ -1218,7 +1218,7 @@ public class ASMifier extends Printer { * * @param method the name of the visit method for this type of annotation. * @param typeRef a reference to the annotated type. The sort of this type reference must be - * {@link jdk.internal.org.objectweb.asm.TypeReference#FIELD}. See {@link jdk.internal.org.objectweb.asm.TypeReference}. + * {@link org.objectweb.asm.TypeReference#FIELD}. See {@link org.objectweb.asm.TypeReference}. * @param typePath the path to the annotated type argument, wildcard bound, array element type, or * static inner type within 'typeRef'. May be {@literal null} if the annotation targets * 'typeRef' as a whole. @@ -1583,7 +1583,7 @@ public class ASMifier extends Printer { * * @param numTypes the number of stack map frame types in 'frameTypes'. * @param frameTypes an array of stack map frame types, in the format described in {@link - * jdk.internal.org.objectweb.asm.MethodVisitor#visitFrame}. + * org.objectweb.asm.MethodVisitor#visitFrame}. */ private void declareFrameTypes(final int numTypes, final Object[] frameTypes) { for (int i = 0; i < numTypes; ++i) { @@ -1598,7 +1598,7 @@ public class ASMifier extends Printer { * * @param numTypes the number of stack map frame types in 'frameTypes'. * @param frameTypes an array of stack map frame types, in the format described in {@link - * jdk.internal.org.objectweb.asm.MethodVisitor#visitFrame}. + * org.objectweb.asm.MethodVisitor#visitFrame}. */ private void appendFrameTypes(final int numTypes, final Object[] frameTypes) { for (int i = 0; i < numTypes; ++i) { diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifierSupport.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/ASMifierSupport.java similarity index 94% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifierSupport.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/ASMifierSupport.java index b592281332f..16ae203cd16 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifierSupport.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/ASMifierSupport.java @@ -57,13 +57,13 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.util; +package org.objectweb.asm.util; import java.util.Map; -import jdk.internal.org.objectweb.asm.Label; +import org.objectweb.asm.Label; /** - * An {@link jdk.internal.org.objectweb.asm.Attribute} that can generate the ASM code to create an equivalent + * An {@link org.objectweb.asm.Attribute} that can generate the ASM code to create an equivalent * attribute. * * @author Eugene Kuleshov diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java similarity index 97% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java index 1133c5ee361..7e528b19e98 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java @@ -57,11 +57,11 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.util; +package org.objectweb.asm.util; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; /** * An {@link AnnotationVisitor} that checks that its methods are properly used. diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckClassAdapter.java similarity index 96% rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckClassAdapter.java index 49f4bc78387..eb2e3c487dd 100644 --- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java +++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckClassAdapter.java @@ -57,7 +57,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -package jdk.internal.org.objectweb.asm.util; +package org.objectweb.asm.util; import java.io.FileInputStream; import java.io.IOException; @@ -67,28 +67,28 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.Attribute; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.FieldVisitor; -import jdk.internal.org.objectweb.asm.Label; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.ModuleVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.RecordComponentVisitor; -import jdk.internal.org.objectweb.asm.Type; -import jdk.internal.org.objectweb.asm.TypePath; -import jdk.internal.org.objectweb.asm.TypeReference; -import jdk.internal.org.objectweb.asm.tree.ClassNode; -import jdk.internal.org.objectweb.asm.tree.MethodNode; -import jdk.internal.org.objectweb.asm.tree.TryCatchBlockNode; -import jdk.internal.org.objectweb.asm.tree.analysis.Analyzer; -import jdk.internal.org.objectweb.asm.tree.analysis.AnalyzerException; -import jdk.internal.org.objectweb.asm.tree.analysis.BasicValue; -import jdk.internal.org.objectweb.asm.tree.analysis.Frame; -import jdk.internal.org.objectweb.asm.tree.analysis.SimpleVerifier; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Attribute; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.ModuleVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.RecordComponentVisitor; +import org.objectweb.asm.Type; +import org.objectweb.asm.TypePath; +import org.objectweb.asm.TypeReference; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.TryCatchBlockNode; +import org.objectweb.asm.tree.analysis.Analyzer; +import org.objectweb.asm.tree.analysis.AnalyzerException; +import org.objectweb.asm.tree.analysis.BasicValue; +import org.objectweb.asm.tree.analysis.Frame; +import org.objectweb.asm.tree.analysis.SimpleVerifier; /** * A {@link ClassVisitor} that checks that its methods are properly used. More precisely this class @@ -121,9 +121,9 @@ import jdk.internal.org.objectweb.asm.tree.analysis.SimpleVerifier; * instruction. For example (format is - insnNumber locals : stack): * * 

    - * jdk.internal.org.objectweb.asm.tree.analysis.AnalyzerException: Error at instruction 71: Expected I, but found .
- *   at jdk.internal.org.objectweb.asm.tree.analysis.Analyzer.analyze(Analyzer.java:...)
- *   at jdk.internal.org.objectweb.asm.util.CheckClassAdapter.verify(CheckClassAdapter.java:...)
+ * org.objectweb.asm.tree.analysis.AnalyzerException: Error at instruction 71: Expected I, but found .
+ *   at org.objectweb.asm.tree.analysis.Analyzer.analyze(Analyzer.java:...)
+ *   at org.objectweb.asm.util.CheckClassAdapter.verify(CheckClassAdapter.java:...)
  * ...
  * remove()V
  * 00000 LinkedBlockingQueue$Itr . . . . . . . .  : ICONST_0
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckFieldAdapter.java
similarity index 94%
rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java
rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckFieldAdapter.java
index 16b0ea8d7d6..f50096e84f6 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckFieldAdapter.java
@@ -57,14 +57,14 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package jdk.internal.org.objectweb.asm.util;
+package org.objectweb.asm.util;
 
-import jdk.internal.org.objectweb.asm.AnnotationVisitor;
-import jdk.internal.org.objectweb.asm.Attribute;
-import jdk.internal.org.objectweb.asm.FieldVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.TypePath;
-import jdk.internal.org.objectweb.asm.TypeReference;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.TypePath;
+import org.objectweb.asm.TypeReference;
 
 /**
  * A {@link FieldVisitor} that checks that its methods are properly used.
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckFrameAnalyzer.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckFrameAnalyzer.java
similarity index 95%
rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckFrameAnalyzer.java
rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckFrameAnalyzer.java
index 754f648ad9a..10e2936c9ff 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckFrameAnalyzer.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckFrameAnalyzer.java
@@ -57,28 +57,28 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package jdk.internal.org.objectweb.asm.util;
+package org.objectweb.asm.util;
 
 import java.util.Collections;
 import java.util.List;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.Type;
-import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode;
-import jdk.internal.org.objectweb.asm.tree.FrameNode;
-import jdk.internal.org.objectweb.asm.tree.InsnList;
-import jdk.internal.org.objectweb.asm.tree.InsnNode;
-import jdk.internal.org.objectweb.asm.tree.JumpInsnNode;
-import jdk.internal.org.objectweb.asm.tree.LabelNode;
-import jdk.internal.org.objectweb.asm.tree.LookupSwitchInsnNode;
-import jdk.internal.org.objectweb.asm.tree.MethodNode;
-import jdk.internal.org.objectweb.asm.tree.TableSwitchInsnNode;
-import jdk.internal.org.objectweb.asm.tree.TryCatchBlockNode;
-import jdk.internal.org.objectweb.asm.tree.TypeInsnNode;
-import jdk.internal.org.objectweb.asm.tree.analysis.Analyzer;
-import jdk.internal.org.objectweb.asm.tree.analysis.AnalyzerException;
-import jdk.internal.org.objectweb.asm.tree.analysis.Frame;
-import jdk.internal.org.objectweb.asm.tree.analysis.Interpreter;
-import jdk.internal.org.objectweb.asm.tree.analysis.Value;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.FrameNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.InsnNode;
+import org.objectweb.asm.tree.JumpInsnNode;
+import org.objectweb.asm.tree.LabelNode;
+import org.objectweb.asm.tree.LookupSwitchInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.TableSwitchInsnNode;
+import org.objectweb.asm.tree.TryCatchBlockNode;
+import org.objectweb.asm.tree.TypeInsnNode;
+import org.objectweb.asm.tree.analysis.Analyzer;
+import org.objectweb.asm.tree.analysis.AnalyzerException;
+import org.objectweb.asm.tree.analysis.Frame;
+import org.objectweb.asm.tree.analysis.Interpreter;
+import org.objectweb.asm.tree.analysis.Value;
 
 /**
  * An {@link Analyzer} subclass which checks that methods provide stack map frames where expected
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckMethodAdapter.java
similarity index 98%
rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java
rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckMethodAdapter.java
index 59c41108628..163ad48b9ab 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckMethodAdapter.java
@@ -57,7 +57,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package jdk.internal.org.objectweb.asm.util;
+package org.objectweb.asm.util;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -67,22 +67,22 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import jdk.internal.org.objectweb.asm.AnnotationVisitor;
-import jdk.internal.org.objectweb.asm.Attribute;
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.ConstantDynamic;
-import jdk.internal.org.objectweb.asm.Handle;
-import jdk.internal.org.objectweb.asm.Label;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.Type;
-import jdk.internal.org.objectweb.asm.TypePath;
-import jdk.internal.org.objectweb.asm.TypeReference;
-import jdk.internal.org.objectweb.asm.tree.MethodNode;
-import jdk.internal.org.objectweb.asm.tree.analysis.Analyzer;
-import jdk.internal.org.objectweb.asm.tree.analysis.AnalyzerException;
-import jdk.internal.org.objectweb.asm.tree.analysis.BasicValue;
-import jdk.internal.org.objectweb.asm.tree.analysis.BasicVerifier;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.ConstantDynamic;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.TypePath;
+import org.objectweb.asm.TypeReference;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.analysis.Analyzer;
+import org.objectweb.asm.tree.analysis.AnalyzerException;
+import org.objectweb.asm.tree.analysis.BasicValue;
+import org.objectweb.asm.tree.analysis.BasicVerifier;
 
 /**
  * A {@link MethodVisitor} that checks that its methods are properly used. More precisely this
@@ -90,7 +90,7 @@ import jdk.internal.org.objectweb.asm.tree.analysis.BasicVerifier;
  * preconditions based only on its arguments - such as the fact that the given opcode is
  * correct for a given visit method. This adapter can also perform some basic data flow checks (more
  * precisely those that can be performed without the full class hierarchy - see {@link
- * jdk.internal.org.objectweb.asm.tree.analysis.BasicVerifier}). For instance in a method whose signature is
+ * org.objectweb.asm.tree.analysis.BasicVerifier}). For instance in a method whose signature is
  * {@code void m ()}, the invalid instruction IRETURN, or the invalid sequence IADD L2I will be
  * detected if the data flow checks are enabled. These checks are enabled by using the {@link
  * #CheckMethodAdapter(int,String,String,MethodVisitor,Map)} constructor. They are not performed if
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckModuleAdapter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckModuleAdapter.java
similarity index 96%
rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckModuleAdapter.java
rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckModuleAdapter.java
index de94a1d32dd..806f7584f0d 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckModuleAdapter.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckModuleAdapter.java
@@ -57,11 +57,11 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package jdk.internal.org.objectweb.asm.util;
+package org.objectweb.asm.util;
 
 import java.util.HashSet;
-import jdk.internal.org.objectweb.asm.ModuleVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.ModuleVisitor;
+import org.objectweb.asm.Opcodes;
 
 /**
  * A {@link ModuleVisitor} that checks that its methods are properly used.
@@ -99,7 +99,7 @@ public class CheckModuleAdapter extends ModuleVisitor {
       *
       * @param moduleVisitor the module visitor to which this adapter must delegate calls.
       * @param isOpen whether the visited module is open. Open modules have their {@link
-      *     Opcodes#ACC_OPEN} access flag set in {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitModule}.
+      *     Opcodes#ACC_OPEN} access flag set in {@link org.objectweb.asm.ClassVisitor#visitModule}.
       * @throws IllegalStateException If a subclass calls this constructor.
       */
     public CheckModuleAdapter(final ModuleVisitor moduleVisitor, final boolean isOpen) {
@@ -116,7 +116,7 @@ public class CheckModuleAdapter extends ModuleVisitor {
       *     ASM}x values in {@link Opcodes}.
       * @param moduleVisitor the module visitor to which this adapter must delegate calls.
       * @param isOpen whether the visited module is open. Open modules have their {@link
-      *     Opcodes#ACC_OPEN} access flag set in {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitModule}.
+      *     Opcodes#ACC_OPEN} access flag set in {@link org.objectweb.asm.ClassVisitor#visitModule}.
       */
     protected CheckModuleAdapter(
             final int api, final ModuleVisitor moduleVisitor, final boolean isOpen) {
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckRecordComponentAdapter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckRecordComponentAdapter.java
similarity index 94%
rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckRecordComponentAdapter.java
rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckRecordComponentAdapter.java
index 850f1c8dc3e..7f4c7481b56 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckRecordComponentAdapter.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckRecordComponentAdapter.java
@@ -57,14 +57,14 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package jdk.internal.org.objectweb.asm.util;
+package org.objectweb.asm.util;
 
-import jdk.internal.org.objectweb.asm.AnnotationVisitor;
-import jdk.internal.org.objectweb.asm.Attribute;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.RecordComponentVisitor;
-import jdk.internal.org.objectweb.asm.TypePath;
-import jdk.internal.org.objectweb.asm.TypeReference;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.RecordComponentVisitor;
+import org.objectweb.asm.TypePath;
+import org.objectweb.asm.TypeReference;
 
 /**
  * A {@link RecordComponentVisitor} that checks that its methods are properly used.
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckSignatureAdapter.java
similarity index 98%
rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java
rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckSignatureAdapter.java
index 19a3998f0a2..fa4682387d3 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/CheckSignatureAdapter.java
@@ -57,11 +57,11 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package jdk.internal.org.objectweb.asm.util;
+package org.objectweb.asm.util;
 
 import java.util.EnumSet;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.signature.SignatureVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.signature.SignatureVisitor;
 
 /**
  * A {@link SignatureVisitor} that checks that its methods are properly used.
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/Printer.java
similarity index 88%
rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java
rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/Printer.java
index 00378e8dcce..fa30c7e167a 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/Printer.java
@@ -57,7 +57,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package jdk.internal.org.objectweb.asm.util;
+package org.objectweb.asm.util;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -65,15 +65,15 @@ import java.io.InputStream;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
-import jdk.internal.org.objectweb.asm.Attribute;
-import jdk.internal.org.objectweb.asm.ClassReader;
-import jdk.internal.org.objectweb.asm.ConstantDynamic;
-import jdk.internal.org.objectweb.asm.Handle;
-import jdk.internal.org.objectweb.asm.Label;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.Type;
-import jdk.internal.org.objectweb.asm.TypePath;
-import jdk.internal.org.objectweb.asm.TypeReference;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ConstantDynamic;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.TypePath;
+import org.objectweb.asm.TypeReference;
 
 /**
  * An abstract converter from visit events to text.
@@ -288,7 +288,7 @@ public abstract class Printer {
 
     /**
       * The names of the {@code operand} values of the {@link
-      * jdk.internal.org.objectweb.asm.MethodVisitor#visitIntInsn} method when {@code opcode} is {@code NEWARRAY}.
+      * org.objectweb.asm.MethodVisitor#visitIntInsn} method when {@code opcode} is {@code NEWARRAY}.
       */
     public static final String[] TYPES = {
         "",
@@ -305,7 +305,7 @@ public abstract class Printer {
         "T_LONG"
     };
 
-    /** The names of the {@code tag} field values for {@link jdk.internal.org.objectweb.asm.Handle}. */
+    /** The names of the {@code tag} field values for {@link org.objectweb.asm.Handle}. */
     public static final String[] HANDLE_TAG = {
         "",
         "H_GETFIELD",
@@ -364,7 +364,7 @@ public abstract class Printer {
     // -----------------------------------------------------------------------------------------------
 
     /**
-      * Class header. See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visit}.
+      * Class header. See {@link org.objectweb.asm.ClassVisitor#visit}.
       *
       * @param version the class version. The minor version is stored in the 16 most significant bits,
       *     and the major version in the 16 least significant bits.
@@ -388,7 +388,7 @@ public abstract class Printer {
             String[] interfaces);
 
     /**
-      * Class source. See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitSource}.
+      * Class source. See {@link org.objectweb.asm.ClassVisitor#visitSource}.
       *
       * @param source the name of the source file from which the class was compiled. May be {@literal
       *     null}.
@@ -398,7 +398,7 @@ public abstract class Printer {
     public abstract void visitSource(String source, String debug);
 
     /**
-      * Module. See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitModule}.
+      * Module. See {@link org.objectweb.asm.ClassVisitor#visitModule}.
       *
       * @param name the fully qualified name (using dots) of the module.
       * @param access the module access flags, among {@code ACC_OPEN}, {@code ACC_SYNTHETIC} and {@code
@@ -426,7 +426,7 @@ public abstract class Printer {
     }
 
     /**
-      * Class outer class. See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitOuterClass}.
+      * Class outer class. See {@link org.objectweb.asm.ClassVisitor#visitOuterClass}.
       *
       * @param owner internal name of the enclosing class of the class (see {@link
       *     Type#getInternalName()}).
@@ -438,7 +438,7 @@ public abstract class Printer {
     public abstract void visitOuterClass(String owner, String name, String descriptor);
 
     /**
-      * Class annotation. See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitAnnotation}.
+      * Class annotation. See {@link org.objectweb.asm.ClassVisitor#visitAnnotation}.
       *
       * @param descriptor the class descriptor of the annotation class.
       * @param visible {@literal true} if the annotation is visible at runtime.
@@ -447,7 +447,7 @@ public abstract class Printer {
     public abstract Printer visitClassAnnotation(String descriptor, boolean visible);
 
     /**
-      * Class type annotation. See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitTypeAnnotation}.
+      * Class type annotation. See {@link org.objectweb.asm.ClassVisitor#visitTypeAnnotation}.
       *
       * @param typeRef a reference to the annotated type. The sort of this type reference must be
       *     {@link TypeReference#CLASS_TYPE_PARAMETER}, {@link
@@ -466,7 +466,7 @@ public abstract class Printer {
     }
 
     /**
-      * Class attribute. See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitAttribute}.
+      * Class attribute. See {@link org.objectweb.asm.ClassVisitor#visitAttribute}.
       *
       * @param attribute an attribute.
       */
@@ -487,7 +487,7 @@ public abstract class Printer {
 
     /**
       * Visits a permitted subclasses. A permitted subclass is one of the allowed subclasses of the
-      * current class. See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitPermittedSubclass(String)}.
+      * current class. See {@link org.objectweb.asm.ClassVisitor#visitPermittedSubclass(String)}.
       *
       * @param permittedSubclass the internal name of a permitted subclass (see {@link
       *     Type#getInternalName()}).
@@ -497,7 +497,7 @@ public abstract class Printer {
     }
 
     /**
-      * Class inner name. See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitInnerClass}.
+      * Class inner name. See {@link org.objectweb.asm.ClassVisitor#visitInnerClass}.
       *
       * @param name the internal name of an inner class (see {@link Type#getInternalName()}).
       * @param outerName the internal name of the class to which the inner class belongs (see {@link
@@ -511,7 +511,7 @@ public abstract class Printer {
 
     /**
       * Visits a record component of the class. See {@link
-      * jdk.internal.org.objectweb.asm.ClassVisitor#visitRecordComponent(String, String, String)}.
+      * org.objectweb.asm.ClassVisitor#visitRecordComponent(String, String, String)}.
       *
       * @param name the field's name.
       * @param descriptor the record component descriptor (see {@link Type}).
@@ -526,7 +526,7 @@ public abstract class Printer {
     }
 
     /**
-      * Class field. See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitField}.
+      * Class field. See {@link org.objectweb.asm.ClassVisitor#visitField}.
       *
       * @param access the field's access flags (see {@link Opcodes}). This parameter also indicates if
       *     the field is synthetic and/or deprecated.
@@ -546,7 +546,7 @@ public abstract class Printer {
             int access, String name, String descriptor, String signature, Object value);
 
     /**
-      * Class method. See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitMethod}.
+      * Class method. See {@link org.objectweb.asm.ClassVisitor#visitMethod}.
       *
       * @param access the method's access flags (see {@link Opcodes}). This parameter also indicates if
       *     the method is synthetic and/or deprecated.
@@ -561,7 +561,7 @@ public abstract class Printer {
     public abstract Printer visitMethod(
             int access, String name, String descriptor, String signature, String[] exceptions);
 
-    /** Class end. See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitEnd}. */
+    /** Class end. See {@link org.objectweb.asm.ClassVisitor#visitEnd}. */
     public abstract void visitClassEnd();
 
     // -----------------------------------------------------------------------------------------------
@@ -569,7 +569,7 @@ public abstract class Printer {
     // -----------------------------------------------------------------------------------------------
 
     /**
-      * Module main class. See {@link jdk.internal.org.objectweb.asm.ModuleVisitor#visitMainClass}.
+      * Module main class. See {@link org.objectweb.asm.ModuleVisitor#visitMainClass}.
       *
       * @param mainClass the internal name of the main class of the current module (see {@link
       *     Type#getInternalName()}).
@@ -579,7 +579,7 @@ public abstract class Printer {
     }
 
     /**
-      * Module package. See {@link jdk.internal.org.objectweb.asm.ModuleVisitor#visitPackage}.
+      * Module package. See {@link org.objectweb.asm.ModuleVisitor#visitPackage}.
       *
       * @param packaze the internal name of a package (see {@link Type#getInternalName()}).
       */
@@ -588,7 +588,7 @@ public abstract class Printer {
     }
 
     /**
-      * Module require. See {@link jdk.internal.org.objectweb.asm.ModuleVisitor#visitRequire}.
+      * Module require. See {@link org.objectweb.asm.ModuleVisitor#visitRequire}.
       *
       * @param module the fully qualified name (using dots) of the dependence.
       * @param access the access flag of the dependence among {@code ACC_TRANSITIVE}, {@code
@@ -600,7 +600,7 @@ public abstract class Printer {
     }
 
     /**
-      * Module export. See {@link jdk.internal.org.objectweb.asm.ModuleVisitor#visitExport}.
+      * Module export. See {@link org.objectweb.asm.ModuleVisitor#visitExport}.
       *
       * @param packaze the internal name of the exported package (see {@link Type#getInternalName()}).
       * @param access the access flag of the exported package, valid values are among {@code
@@ -613,7 +613,7 @@ public abstract class Printer {
     }
 
     /**
-      * Module open. See {@link jdk.internal.org.objectweb.asm.ModuleVisitor#visitOpen}.
+      * Module open. See {@link org.objectweb.asm.ModuleVisitor#visitOpen}.
       *
       * @param packaze the internal name of the opened package (see {@link Type#getInternalName()}).
       * @param access the access flag of the opened package, valid values are among {@code
@@ -626,7 +626,7 @@ public abstract class Printer {
     }
 
     /**
-      * Module use. See {@link jdk.internal.org.objectweb.asm.ModuleVisitor#visitUse}.
+      * Module use. See {@link org.objectweb.asm.ModuleVisitor#visitUse}.
       *
       * @param service the internal name of the service (see {@link Type#getInternalName()}).
       */
@@ -635,7 +635,7 @@ public abstract class Printer {
     }
 
     /**
-      * Module provide. See {@link jdk.internal.org.objectweb.asm.ModuleVisitor#visitProvide}.
+      * Module provide. See {@link org.objectweb.asm.ModuleVisitor#visitProvide}.
       *
       * @param service the internal name of the service (see {@link Type#getInternalName()}).
       * @param providers the internal names of the implementations of the service (there is at least
@@ -645,7 +645,7 @@ public abstract class Printer {
         throw new UnsupportedOperationException(UNSUPPORTED_OPERATION);
     }
 
-    /** Module end. See {@link jdk.internal.org.objectweb.asm.ModuleVisitor#visitEnd}. */
+    /** Module end. See {@link org.objectweb.asm.ModuleVisitor#visitEnd}. */
     public void visitModuleEnd() {
         throw new UnsupportedOperationException(UNSUPPORTED_OPERATION);
     }
@@ -655,7 +655,7 @@ public abstract class Printer {
     // -----------------------------------------------------------------------------------------------
 
     /**
-      * Annotation value. See {@link jdk.internal.org.objectweb.asm.AnnotationVisitor#visit}.
+      * Annotation value. See {@link org.objectweb.asm.AnnotationVisitor#visit}.
       *
       * @param name the value name.
       * @param value the actual value, whose type must be {@link Byte}, {@link Boolean}, {@link
@@ -669,7 +669,7 @@ public abstract class Printer {
     public abstract void visit(String name, Object value);
 
     /**
-      * Annotation enum value. See {@link jdk.internal.org.objectweb.asm.AnnotationVisitor#visitEnum}.
+      * Annotation enum value. See {@link org.objectweb.asm.AnnotationVisitor#visitEnum}.
       *
       * @param name the value name.
       * @param descriptor the class descriptor of the enumeration class.
@@ -678,7 +678,7 @@ public abstract class Printer {
     public abstract void visitEnum(String name, String descriptor, String value);
 
     /**
-      * Nested annotation value. See {@link jdk.internal.org.objectweb.asm.AnnotationVisitor#visitAnnotation}.
+      * Nested annotation value. See {@link org.objectweb.asm.AnnotationVisitor#visitAnnotation}.
       *
       * @param name the value name.
       * @param descriptor the class descriptor of the nested annotation class.
@@ -687,14 +687,14 @@ public abstract class Printer {
     public abstract Printer visitAnnotation(String name, String descriptor);
 
     /**
-      * Annotation array value. See {@link jdk.internal.org.objectweb.asm.AnnotationVisitor#visitArray}.
+      * Annotation array value. See {@link org.objectweb.asm.AnnotationVisitor#visitArray}.
       *
       * @param name the value name.
       * @return the printer.
       */
     public abstract Printer visitArray(String name);
 
-    /** Annotation end. See {@link jdk.internal.org.objectweb.asm.AnnotationVisitor#visitEnd}. */
+    /** Annotation end. See {@link org.objectweb.asm.AnnotationVisitor#visitEnd}. */
     public abstract void visitAnnotationEnd();
 
     // -----------------------------------------------------------------------------------------------
@@ -703,7 +703,7 @@ public abstract class Printer {
 
     /**
       * Visits an annotation of the record component. See {@link
-      * jdk.internal.org.objectweb.asm.RecordComponentVisitor#visitAnnotation}.
+      * org.objectweb.asm.RecordComponentVisitor#visitAnnotation}.
       *
       * @param descriptor the class descriptor of the annotation class.
       * @param visible {@literal true} if the annotation is visible at runtime.
@@ -716,7 +716,7 @@ public abstract class Printer {
 
     /**
       * Visits an annotation on a type in the record component signature. See {@link
-      * jdk.internal.org.objectweb.asm.RecordComponentVisitor#visitTypeAnnotation}.
+      * org.objectweb.asm.RecordComponentVisitor#visitTypeAnnotation}.
       *
       * @param typeRef a reference to the annotated type. The sort of this type reference must be
       *     {@link TypeReference#CLASS_TYPE_PARAMETER}, {@link
@@ -737,7 +737,7 @@ public abstract class Printer {
 
     /**
       * Visits a non standard attribute of the record component. See {@link
-      * jdk.internal.org.objectweb.asm.RecordComponentVisitor#visitAttribute}.
+      * org.objectweb.asm.RecordComponentVisitor#visitAttribute}.
       *
       * @param attribute an attribute.
       */
@@ -747,7 +747,7 @@ public abstract class Printer {
 
     /**
       * Visits the end of the record component. See {@link
-      * jdk.internal.org.objectweb.asm.RecordComponentVisitor#visitEnd}. This method, which is the last one to be
+      * org.objectweb.asm.RecordComponentVisitor#visitEnd}. This method, which is the last one to be
       * called, is used to inform the visitor that everything have been visited.
       */
     public void visitRecordComponentEnd() {
@@ -759,7 +759,7 @@ public abstract class Printer {
     // -----------------------------------------------------------------------------------------------
 
     /**
-      * Field annotation. See {@link jdk.internal.org.objectweb.asm.FieldVisitor#visitAnnotation}.
+      * Field annotation. See {@link org.objectweb.asm.FieldVisitor#visitAnnotation}.
       *
       * @param descriptor the class descriptor of the annotation class.
       * @param visible {@literal true} if the annotation is visible at runtime.
@@ -768,7 +768,7 @@ public abstract class Printer {
     public abstract Printer visitFieldAnnotation(String descriptor, boolean visible);
 
     /**
-      * Field type annotation. See {@link jdk.internal.org.objectweb.asm.FieldVisitor#visitTypeAnnotation}.
+      * Field type annotation. See {@link org.objectweb.asm.FieldVisitor#visitTypeAnnotation}.
       *
       * @param typeRef a reference to the annotated type. The sort of this type reference must be
       *     {@link TypeReference#FIELD}. See {@link TypeReference}.
@@ -785,13 +785,13 @@ public abstract class Printer {
     }
 
     /**
-      * Field attribute. See {@link jdk.internal.org.objectweb.asm.FieldVisitor#visitAttribute}.
+      * Field attribute. See {@link org.objectweb.asm.FieldVisitor#visitAttribute}.
       *
       * @param attribute an attribute.
       */
     public abstract void visitFieldAttribute(Attribute attribute);
 
-    /** Field end. See {@link jdk.internal.org.objectweb.asm.FieldVisitor#visitEnd}. */
+    /** Field end. See {@link org.objectweb.asm.FieldVisitor#visitEnd}. */
     public abstract void visitFieldEnd();
 
     // -----------------------------------------------------------------------------------------------
@@ -799,7 +799,7 @@ public abstract class Printer {
     // -----------------------------------------------------------------------------------------------
 
     /**
-      * Method parameter. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitParameter(String, int)}.
+      * Method parameter. See {@link org.objectweb.asm.MethodVisitor#visitParameter(String, int)}.
       *
       * @param name parameter name or {@literal null} if none is provided.
       * @param access the parameter's access flags, only {@code ACC_FINAL}, {@code ACC_SYNTHETIC}
@@ -810,14 +810,14 @@ public abstract class Printer {
     }
 
     /**
-      * Method default annotation. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitAnnotationDefault}.
+      * Method default annotation. See {@link org.objectweb.asm.MethodVisitor#visitAnnotationDefault}.
       *
       * @return the printer.
       */
     public abstract Printer visitAnnotationDefault();
 
     /**
-      * Method annotation. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitAnnotation}.
+      * Method annotation. See {@link org.objectweb.asm.MethodVisitor#visitAnnotation}.
       *
       * @param descriptor the class descriptor of the annotation class.
       * @param visible {@literal true} if the annotation is visible at runtime.
@@ -826,7 +826,7 @@ public abstract class Printer {
     public abstract Printer visitMethodAnnotation(String descriptor, boolean visible);
 
     /**
-      * Method type annotation. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitTypeAnnotation}.
+      * Method type annotation. See {@link org.objectweb.asm.MethodVisitor#visitTypeAnnotation}.
       *
       * @param typeRef a reference to the annotated type. The sort of this type reference must be
       *     {@link TypeReference#METHOD_TYPE_PARAMETER}, {@link
@@ -847,7 +847,7 @@ public abstract class Printer {
 
     /**
       * Number of method parameters that can have annotations. See {@link
-      * jdk.internal.org.objectweb.asm.MethodVisitor#visitAnnotableParameterCount}.
+      * org.objectweb.asm.MethodVisitor#visitAnnotableParameterCount}.
       *
       * @param parameterCount the number of method parameters than can have annotations. This number
       *     must be less or equal than the number of parameter types in the method descriptor. It can
@@ -865,7 +865,7 @@ public abstract class Printer {
 
     /**
       * Method parameter annotation. See {@link
-      * jdk.internal.org.objectweb.asm.MethodVisitor#visitParameterAnnotation}.
+      * org.objectweb.asm.MethodVisitor#visitParameterAnnotation}.
       *
       * @param parameter the parameter index. This index must be strictly smaller than the number of
       *     parameters in the method descriptor, and strictly smaller than the parameter count
@@ -881,17 +881,17 @@ public abstract class Printer {
             int parameter, String descriptor, boolean visible);
 
     /**
-      * Method attribute. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitAttribute}.
+      * Method attribute. See {@link org.objectweb.asm.MethodVisitor#visitAttribute}.
       *
       * @param attribute an attribute.
       */
     public abstract void visitMethodAttribute(Attribute attribute);
 
-    /** Method start. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitCode}. */
+    /** Method start. See {@link org.objectweb.asm.MethodVisitor#visitCode}. */
     public abstract void visitCode();
 
     /**
-      * Method stack frame. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitFrame}.
+      * Method stack frame. See {@link org.objectweb.asm.MethodVisitor#visitFrame}.
       *
       * @param type the type of this stack map frame. Must be {@link Opcodes#F_NEW} for expanded
       *     frames, or {@link Opcodes#F_FULL}, {@link Opcodes#F_APPEND}, {@link Opcodes#F_CHOP}, {@link
@@ -912,7 +912,7 @@ public abstract class Printer {
             int type, int numLocal, Object[] local, int numStack, Object[] stack);
 
     /**
-      * Method instruction. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitInsn}
+      * Method instruction. See {@link org.objectweb.asm.MethodVisitor#visitInsn}
       *
       * @param opcode the opcode of the instruction to be visited. This opcode is either NOP,
       *     ACONST_NULL, ICONST_M1, ICONST_0, ICONST_1, ICONST_2, ICONST_3, ICONST_4, ICONST_5,
@@ -928,7 +928,7 @@ public abstract class Printer {
     public abstract void visitInsn(int opcode);
 
     /**
-      * Method instruction. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitIntInsn}.
+      * Method instruction. See {@link org.objectweb.asm.MethodVisitor#visitIntInsn}.
       *
       * @param opcode the opcode of the instruction to be visited. This opcode is either BIPUSH, SIPUSH
       *     or NEWARRAY.
@@ -944,7 +944,7 @@ public abstract class Printer {
     public abstract void visitIntInsn(int opcode, int operand);
 
     /**
-      * Method instruction. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitVarInsn}.
+      * Method instruction. See {@link org.objectweb.asm.MethodVisitor#visitVarInsn}.
       *
       * @param opcode the opcode of the local variable instruction to be visited. This opcode is either
       *     ILOAD, LLOAD, FLOAD, DLOAD, ALOAD, ISTORE, LSTORE, FSTORE, DSTORE, ASTORE or RET.
@@ -954,7 +954,7 @@ public abstract class Printer {
     public abstract void visitVarInsn(int opcode, int varIndex);
 
     /**
-      * Method instruction. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitTypeInsn}.
+      * Method instruction. See {@link org.objectweb.asm.MethodVisitor#visitTypeInsn}.
       *
       * @param opcode the opcode of the type instruction to be visited. This opcode is either NEW,
       *     ANEWARRAY, CHECKCAST or INSTANCEOF.
@@ -964,7 +964,7 @@ public abstract class Printer {
     public abstract void visitTypeInsn(int opcode, String type);
 
     /**
-      * Method instruction. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitFieldInsn}.
+      * Method instruction. See {@link org.objectweb.asm.MethodVisitor#visitFieldInsn}.
       *
       * @param opcode the opcode of the type instruction to be visited. This opcode is either
       *     GETSTATIC, PUTSTATIC, GETFIELD or PUTFIELD.
@@ -975,7 +975,7 @@ public abstract class Printer {
     public abstract void visitFieldInsn(int opcode, String owner, String name, String descriptor);
 
     /**
-      * Method instruction. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitMethodInsn}.
+      * Method instruction. See {@link org.objectweb.asm.MethodVisitor#visitMethodInsn}.
       *
       * @param opcode the opcode of the type instruction to be visited. This opcode is either
       *     INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC or INVOKEINTERFACE.
@@ -995,7 +995,7 @@ public abstract class Printer {
     }
 
     /**
-      * Method instruction. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitMethodInsn}.
+      * Method instruction. See {@link org.objectweb.asm.MethodVisitor#visitMethodInsn}.
       *
       * @param opcode the opcode of the type instruction to be visited. This opcode is either
       *     INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC or INVOKEINTERFACE.
@@ -1015,7 +1015,7 @@ public abstract class Printer {
     }
 
     /**
-      * Method instruction. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitInvokeDynamicInsn}.
+      * Method instruction. See {@link org.objectweb.asm.MethodVisitor#visitInvokeDynamicInsn}.
       *
       * @param name the method's name.
       * @param descriptor the method's descriptor (see {@link Type}).
@@ -1032,7 +1032,7 @@ public abstract class Printer {
             Object... bootstrapMethodArguments);
 
     /**
-      * Method jump instruction. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitJumpInsn}.
+      * Method jump instruction. See {@link org.objectweb.asm.MethodVisitor#visitJumpInsn}.
       *
       * @param opcode the opcode of the type instruction to be visited. This opcode is either IFEQ,
       *     IFNE, IFLT, IFGE, IFGT, IFLE, IF_ICMPEQ, IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT,
@@ -1043,14 +1043,14 @@ public abstract class Printer {
     public abstract void visitJumpInsn(int opcode, Label label);
 
     /**
-      * Method label. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitLabel}.
+      * Method label. See {@link org.objectweb.asm.MethodVisitor#visitLabel}.
       *
       * @param label a {@link Label} object.
       */
     public abstract void visitLabel(Label label);
 
     /**
-      * Method instruction. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitLdcInsn}.
+      * Method instruction. See {@link org.objectweb.asm.MethodVisitor#visitLdcInsn}.
       *
       * @param value the constant to be loaded on the stack. This parameter must be a non null {@link
       *     Integer}, a {@link Float}, a {@link Long}, a {@link Double}, a {@link String}, a {@link
@@ -1062,7 +1062,7 @@ public abstract class Printer {
     public abstract void visitLdcInsn(Object value);
 
     /**
-      * Method instruction. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitIincInsn}.
+      * Method instruction. See {@link org.objectweb.asm.MethodVisitor#visitIincInsn}.
       *
       * @param varIndex index of the local variable to be incremented.
       * @param increment amount to increment the local variable by.
@@ -1070,7 +1070,7 @@ public abstract class Printer {
     public abstract void visitIincInsn(int varIndex, int increment);
 
     /**
-      * Method instruction. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitTableSwitchInsn}.
+      * Method instruction. See {@link org.objectweb.asm.MethodVisitor#visitTableSwitchInsn}.
       *
       * @param min the minimum key value.
       * @param max the maximum key value.
@@ -1081,7 +1081,7 @@ public abstract class Printer {
     public abstract void visitTableSwitchInsn(int min, int max, Label dflt, Label... labels);
 
     /**
-      * Method instruction. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitLookupSwitchInsn}.
+      * Method instruction. See {@link org.objectweb.asm.MethodVisitor#visitLookupSwitchInsn}.
       *
       * @param dflt beginning of the default handler block.
       * @param keys the values of the keys.
@@ -1091,7 +1091,7 @@ public abstract class Printer {
     public abstract void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels);
 
     /**
-      * Method instruction. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitMultiANewArrayInsn}.
+      * Method instruction. See {@link org.objectweb.asm.MethodVisitor#visitMultiANewArrayInsn}.
       *
       * @param descriptor an array type descriptor (see {@link Type}).
       * @param numDimensions the number of dimensions of the array to allocate.
@@ -1099,7 +1099,7 @@ public abstract class Printer {
     public abstract void visitMultiANewArrayInsn(String descriptor, int numDimensions);
 
     /**
-      * Instruction type annotation. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitInsnAnnotation}.
+      * Instruction type annotation. See {@link org.objectweb.asm.MethodVisitor#visitInsnAnnotation}.
       *
       * @param typeRef a reference to the annotated type. The sort of this type reference must be
       *     {@link TypeReference#INSTANCEOF}, {@link TypeReference#NEW}, {@link
@@ -1121,7 +1121,7 @@ public abstract class Printer {
     }
 
     /**
-      * Method exception handler. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitTryCatchBlock}.
+      * Method exception handler. See {@link org.objectweb.asm.MethodVisitor#visitTryCatchBlock}.
       *
       * @param start the beginning of the exception handler's scope (inclusive).
       * @param end the end of the exception handler's scope (exclusive).
@@ -1134,7 +1134,7 @@ public abstract class Printer {
 
     /**
       * Try catch block type annotation. See {@link
-      * jdk.internal.org.objectweb.asm.MethodVisitor#visitTryCatchAnnotation}.
+      * org.objectweb.asm.MethodVisitor#visitTryCatchAnnotation}.
       *
       * @param typeRef a reference to the annotated type. The sort of this type reference must be
       *     {@link TypeReference#EXCEPTION_PARAMETER}. See {@link TypeReference}.
@@ -1151,7 +1151,7 @@ public abstract class Printer {
     }
 
     /**
-      * Method debug info. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitLocalVariable}.
+      * Method debug info. See {@link org.objectweb.asm.MethodVisitor#visitLocalVariable}.
       *
       * @param name the name of a local variable.
       * @param descriptor the type descriptor of this local variable.
@@ -1167,7 +1167,7 @@ public abstract class Printer {
 
     /**
       * Local variable type annotation. See {@link
-      * jdk.internal.org.objectweb.asm.MethodVisitor#visitTryCatchAnnotation}.
+      * org.objectweb.asm.MethodVisitor#visitTryCatchAnnotation}.
       *
       * @param typeRef a reference to the annotated type. The sort of this type reference must be
       *     {@link TypeReference#LOCAL_VARIABLE} or {@link TypeReference#RESOURCE_VARIABLE}. See {@link
@@ -1197,7 +1197,7 @@ public abstract class Printer {
     }
 
     /**
-      * Method debug info. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitLineNumber}.
+      * Method debug info. See {@link org.objectweb.asm.MethodVisitor#visitLineNumber}.
       *
       * @param line a line number. This number refers to the source file from which the class was
       *     compiled.
@@ -1206,14 +1206,14 @@ public abstract class Printer {
     public abstract void visitLineNumber(int line, Label start);
 
     /**
-      * Method max stack and max locals. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitMaxs}.
+      * Method max stack and max locals. See {@link org.objectweb.asm.MethodVisitor#visitMaxs}.
       *
       * @param maxStack maximum stack size of the method.
       * @param maxLocals maximum number of local variables for the method.
       */
     public abstract void visitMaxs(int maxStack, int maxLocals);
 
-    /** Method end. See {@link jdk.internal.org.objectweb.asm.MethodVisitor#visitEnd}. */
+    /** Method end. See {@link org.objectweb.asm.MethodVisitor#visitEnd}. */
     public abstract void visitMethodEnd();
 
     // -----------------------------------------------------------------------------------------------
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/Textifier.java
similarity index 99%
rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java
rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/Textifier.java
index fe8a9c8bf31..3de7b888299 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/Textifier.java
@@ -57,7 +57,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package jdk.internal.org.objectweb.asm.util;
+package org.objectweb.asm.util;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -66,14 +66,14 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import jdk.internal.org.objectweb.asm.Attribute;
-import jdk.internal.org.objectweb.asm.Handle;
-import jdk.internal.org.objectweb.asm.Label;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.Type;
-import jdk.internal.org.objectweb.asm.TypePath;
-import jdk.internal.org.objectweb.asm.TypeReference;
-import jdk.internal.org.objectweb.asm.signature.SignatureReader;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.TypePath;
+import org.objectweb.asm.TypeReference;
+import org.objectweb.asm.signature.SignatureReader;
 
 /**
  * A {@link Printer} that prints a disassembled view of the classes it visits.
@@ -1588,7 +1588,7 @@ public class Textifier extends Printer {
       *
       * @param numTypes the number of stack map frame types in 'frameTypes'.
       * @param frameTypes an array of stack map frame types, in the format described in {@link
-      *     jdk.internal.org.objectweb.asm.MethodVisitor#visitFrame}.
+      *     org.objectweb.asm.MethodVisitor#visitFrame}.
       */
     private void appendFrameTypes(final int numTypes, final Object[] frameTypes) {
         for (int i = 0; i < numTypes; ++i) {
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TextifierSupport.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TextifierSupport.java
similarity index 94%
rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TextifierSupport.java
rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TextifierSupport.java
index 4ce8fe8031c..3d0d9063aec 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TextifierSupport.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TextifierSupport.java
@@ -57,13 +57,13 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package jdk.internal.org.objectweb.asm.util;
+package org.objectweb.asm.util;
 
 import java.util.Map;
-import jdk.internal.org.objectweb.asm.Label;
+import org.objectweb.asm.Label;
 
 /**
- * An {@link jdk.internal.org.objectweb.asm.Attribute} that can print a readable representation of itself.
+ * An {@link org.objectweb.asm.Attribute} that can print a readable representation of itself.
  *
  * @author Eugene Kuleshov
  */
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java
similarity index 97%
rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java
rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java
index f487c69ca64..88f82d4359d 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java
@@ -57,10 +57,10 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package jdk.internal.org.objectweb.asm.util;
+package org.objectweb.asm.util;
 
-import jdk.internal.org.objectweb.asm.AnnotationVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Opcodes;
 
 /**
  * An {@link AnnotationVisitor} that prints the annotations it visits with a {@link Printer}.
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceClassVisitor.java
similarity index 95%
rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java
rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceClassVisitor.java
index a6e58402db9..1505e30c247 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceClassVisitor.java
@@ -57,18 +57,18 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package jdk.internal.org.objectweb.asm.util;
+package org.objectweb.asm.util;
 
 import java.io.PrintWriter;
-import jdk.internal.org.objectweb.asm.AnnotationVisitor;
-import jdk.internal.org.objectweb.asm.Attribute;
-import jdk.internal.org.objectweb.asm.ClassVisitor;
-import jdk.internal.org.objectweb.asm.FieldVisitor;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.ModuleVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.RecordComponentVisitor;
-import jdk.internal.org.objectweb.asm.TypePath;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.ModuleVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.RecordComponentVisitor;
+import org.objectweb.asm.TypePath;
 
 /**
  * A {@link ClassVisitor} that prints the classes it visits with a {@link Printer}. This class
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceFieldVisitor.java
similarity index 94%
rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java
rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceFieldVisitor.java
index 1dd448c640f..0598ea31d10 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceFieldVisitor.java
@@ -57,13 +57,13 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package jdk.internal.org.objectweb.asm.util;
+package org.objectweb.asm.util;
 
-import jdk.internal.org.objectweb.asm.AnnotationVisitor;
-import jdk.internal.org.objectweb.asm.Attribute;
-import jdk.internal.org.objectweb.asm.FieldVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.TypePath;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.TypePath;
 
 /**
  * A {@link FieldVisitor} that prints the fields it visits with a {@link Printer}.
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceMethodVisitor.java
similarity index 97%
rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java
rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceMethodVisitor.java
index 06f96819d3e..4463978a091 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceMethodVisitor.java
@@ -57,15 +57,15 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package jdk.internal.org.objectweb.asm.util;
+package org.objectweb.asm.util;
 
-import jdk.internal.org.objectweb.asm.AnnotationVisitor;
-import jdk.internal.org.objectweb.asm.Attribute;
-import jdk.internal.org.objectweb.asm.Handle;
-import jdk.internal.org.objectweb.asm.Label;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.TypePath;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.TypePath;
 
 /**
  * A {@link MethodVisitor} that prints the methods it visits with a {@link Printer}.
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceModuleVisitor.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceModuleVisitor.java
similarity index 97%
rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceModuleVisitor.java
rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceModuleVisitor.java
index cbd0bf7aca7..7c396fdf65b 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceModuleVisitor.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceModuleVisitor.java
@@ -57,10 +57,10 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package jdk.internal.org.objectweb.asm.util;
+package org.objectweb.asm.util;
 
-import jdk.internal.org.objectweb.asm.ModuleVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.ModuleVisitor;
+import org.objectweb.asm.Opcodes;
 
 /**
  * A {@link ModuleVisitor} that prints the fields it visits with a {@link Printer}.
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceRecordComponentVisitor.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceRecordComponentVisitor.java
similarity index 94%
rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceRecordComponentVisitor.java
rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceRecordComponentVisitor.java
index e40ce8c79cd..06ed71bdec4 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceRecordComponentVisitor.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceRecordComponentVisitor.java
@@ -57,13 +57,13 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package jdk.internal.org.objectweb.asm.util;
+package org.objectweb.asm.util;
 
-import jdk.internal.org.objectweb.asm.AnnotationVisitor;
-import jdk.internal.org.objectweb.asm.Attribute;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.RecordComponentVisitor;
-import jdk.internal.org.objectweb.asm.TypePath;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.RecordComponentVisitor;
+import org.objectweb.asm.TypePath;
 
 /**
  * A {@link RecordComponentVisitor} that prints the record components it visits with a {@link
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceSignatureVisitor.java
similarity index 98%
rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java
rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceSignatureVisitor.java
index ba8da75fdc4..966978ad508 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/util/TraceSignatureVisitor.java
@@ -57,13 +57,13 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package jdk.internal.org.objectweb.asm.util;
+package org.objectweb.asm.util;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.signature.SignatureVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.signature.SignatureVisitor;
 
 /**
  * A {@link SignatureVisitor} that builds the Java generic type declaration corresponding to the
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/version.txt b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/version.txt
similarity index 100%
rename from src/java.base/share/classes/jdk/internal/org/objectweb/asm/version.txt
rename to test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/version.txt
diff --git a/test/hotspot/jtreg/testlibrary/jittester/Makefile b/test/hotspot/jtreg/testlibrary/jittester/Makefile
index 16cb921304d..be06329a535 100644
--- a/test/hotspot/jtreg/testlibrary/jittester/Makefile
+++ b/test/hotspot/jtreg/testlibrary/jittester/Makefile
@@ -96,10 +96,10 @@ manifest:
 	@echo 'Main-Class: jdk.test.lib.jittester.Automatic' >> $(MANIFEST)
 
 compile_testlib: INIT
-	$(JAVAC) -XDignore.symbol.file --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED --add-exports=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED -Xlint $(TESTLIBRARY_SRC_FILES) -d $(CLASSES_DIR)
+	$(JAVAC) -XDignore.symbol.file --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED --add-exports=java.base/org.objectweb.asm=ALL-UNNAMED -Xlint $(TESTLIBRARY_SRC_FILES) -d $(CLASSES_DIR)
 
 COMPILE: INIT filelist compile_testlib
-	$(JAVAC) -cp $(CLASSES_DIR) -XDignore.symbol.file --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED --add-exports=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED -Xlint -sourcepath $(SRC_DIR) -d $(CLASSES_DIR) @filelist
+	$(JAVAC) -cp $(CLASSES_DIR) -XDignore.symbol.file --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED --add-exports=java.base/org.objectweb.asm=ALL-UNNAMED -Xlint -sourcepath $(SRC_DIR) -d $(CLASSES_DIR) @filelist
 
 filelist: $(SRC_FILES)
 		@rm -f $@
@@ -110,7 +110,7 @@ INIT: $(DIST_DIR)
 	$(shell if [ ! -d $(CLASSES_DIR) ]; then mkdir -p $(CLASSES_DIR); fi)
 
 install: clean_testbase testgroup testroot copytestlibrary $(DIST_JAR) cleantmp
-	$(JAVA) --add-exports=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED -ea -jar $(DIST_JAR) $(APPLICATION_ARGS)
+	$(JAVA) --add-exports=java.base/org.objectweb.asm=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED -ea -jar $(DIST_JAR) $(APPLICATION_ARGS)
 
 clean_testbase:
 	@rm -rf $(TESTBASE_DIR)
diff --git a/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java
index 8339131c7d3..592dcff23c9 100644
--- a/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java
+++ b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java
@@ -34,11 +34,11 @@ import java.util.TreeMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.FieldVisitor;
-import jdk.internal.org.objectweb.asm.Label;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
 import jdk.test.lib.util.Pair;
 import jdk.test.lib.jittester.BinaryOperator;
 import jdk.test.lib.jittester.Block;
diff --git a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/GenClassPoolJar.java b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/GenClassPoolJar.java
index 9818ee73c8e..fb3fb4d0e8e 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/GenClassPoolJar.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/GenClassPoolJar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, 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
@@ -42,10 +42,10 @@ import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;
 import javax.tools.StandardJavaFileManager;
 import javax.tools.ToolProvider;
-import jdk.internal.org.objectweb.asm.ClassReader;
-import jdk.internal.org.objectweb.asm.ClassVisitor;
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Opcodes;
 
 /**
  * Class that imitates shell script to produce jar file with many similar
diff --git a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_inMemoryCompilation_keep_cl/TestDescription.java b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_inMemoryCompilation_keep_cl/TestDescription.java
index e4d34d34766..19b2a940788 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_inMemoryCompilation_keep_cl/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_inMemoryCompilation_keep_cl/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, 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,7 @@
  * VM Testbase keywords: [gc, stress, stressopt, nonconcurrent, javac]
  *
  * @modules java.base/jdk.internal.misc
- *          java.base/jdk.internal.org.objectweb.asm
+ * @library /testlibrary/asm
  * @library /vmTestbase
  *          /test/lib
  *
diff --git a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_inMemoryCompilation_keep_class/TestDescription.java b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_inMemoryCompilation_keep_class/TestDescription.java
index 679678959e8..b84411234a5 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_inMemoryCompilation_keep_class/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_inMemoryCompilation_keep_class/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, 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,7 @@
  * VM Testbase keywords: [gc, stress, stressopt, nonconcurrent, javac]
  *
  * @modules java.base/jdk.internal.misc
- *          java.base/jdk.internal.org.objectweb.asm
+ * @library /testlibrary/asm
  * @library /vmTestbase
  *          /test/lib
  *
diff --git a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_inMemoryCompilation_keep_obj/TestDescription.java b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_inMemoryCompilation_keep_obj/TestDescription.java
index 008f44f61f3..f0cc45744c4 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_inMemoryCompilation_keep_obj/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_inMemoryCompilation_keep_obj/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, 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,7 @@
  * VM Testbase keywords: [gc, stress, stressopt, nonconcurrent, javac]
  *
  * @modules java.base/jdk.internal.misc
- *          java.base/jdk.internal.org.objectweb.asm
+ * @library /testlibrary/asm
  * @library /vmTestbase
  *          /test/lib
  *
diff --git a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_keep_cl/TestDescription.java b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_keep_cl/TestDescription.java
index 7ffc9e2c1c1..48f1680897f 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_keep_cl/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_keep_cl/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, 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,7 @@
  * VM Testbase keywords: [gc, stress, stressopt, nonconcurrent, javac]
  *
  * @modules java.base/jdk.internal.misc
- *          java.base/jdk.internal.org.objectweb.asm
+ * @library /testlibrary/asm
  * @library /vmTestbase
  *          /test/lib
  *
diff --git a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_keep_class/TestDescription.java b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_keep_class/TestDescription.java
index e46fe0cef5f..68263db73ac 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_keep_class/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_keep_class/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, 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,7 @@
  * VM Testbase keywords: [gc, stress, stressopt, nonconcurrent, javac]
  *
  * @modules java.base/jdk.internal.misc
- *          java.base/jdk.internal.org.objectweb.asm
+ * @library /testlibrary/asm
  * @library /vmTestbase
  *          /test/lib
  *
diff --git a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_keep_obj/TestDescription.java b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_keep_obj/TestDescription.java
index 7cbeebcfdf4..4ee02a649d3 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_keep_obj/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_keep_obj/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, 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,7 @@
  * VM Testbase keywords: [gc, stress, stressopt, nonconcurrent, javac]
  *
  * @modules java.base/jdk.internal.misc
- *          java.base/jdk.internal.org.objectweb.asm
+ * @library /testlibrary/asm
  * @library /vmTestbase
  *          /test/lib
  *
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007.java
index 91ef81c00c8..6d79e479b97 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, 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,10 +28,10 @@ import java.io.InputStream;
 import java.util.List;
 import java.util.ArrayList;
 
-import jdk.internal.org.objectweb.asm.ClassReader;
-import jdk.internal.org.objectweb.asm.ClassVisitor;
-import jdk.internal.org.objectweb.asm.FieldVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Opcodes;
 
 
 public class getclfld007 {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/TestDescription.java
index 80f5d6f580d..a80f3965c28 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, 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,7 +45,7 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @modules java.base/jdk.internal.org.objectweb.asm
+ * @library /testlibrary/asm
  * @run main/othervm/native -agentlib:getclfld007 nsk.jvmti.GetClassFields.getclfld007
  */
 
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/TestDescription.java
index 642aecf2d17..7b4db6c741c 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, 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,7 +25,6 @@
 /*
  * @test
  * @key randomness
- * @modules java.base/jdk.internal.org.objectweb.asm:+open java.base/jdk.internal.misc:+open
  *
  * @summary converted from VM Testbase vm/compiler/coverage/parentheses.
  * VM Testbase keywords: [quick, stressopt, jit]
@@ -44,6 +43,7 @@
  *     For generation instructions test using right parentheses sequence. Open parenthesis "(" is correspondent to
  *     stack increasing instructions, ")" is corresponded stack decreasing instructions.
  *
+ * @library /testlibrary/asm
  * @library /vmTestbase
  *          /test/lib
  * @run main/othervm vm.compiler.coverage.parentheses.Parentheses
diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/HotspotInstructionsExecutor.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/HotspotInstructionsExecutor.java
index a04b7623f9e..c6320d6250c 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/HotspotInstructionsExecutor.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/coverage/parentheses/share/HotspotInstructionsExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, 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,10 +25,10 @@ package vm.compiler.coverage.parentheses.share;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.reflect.Field;
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.MethodVisitor;
 
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
 
 
 import java.lang.reflect.Method;
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenCPFullOfMH.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenCPFullOfMH.java
index 7c00c29777b..2bab7c42c27 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenCPFullOfMH.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenCPFullOfMH.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, 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,11 +23,11 @@
 
 package vm.mlvm.cp.share;
 
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.ClassWriterExt;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.Handle;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.ClassWriterExt;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Handle;
 
 import vm.mlvm.share.ClassfileGenerator;
 import vm.mlvm.share.Env;
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenCPFullOfMT.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenCPFullOfMT.java
index 1033a57a4c2..f7e3057cf24 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenCPFullOfMT.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenCPFullOfMT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, 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,11 +23,11 @@
 
 package vm.mlvm.cp.share;
 
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.ClassWriterExt;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.Type;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.ClassWriterExt;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
 
 import vm.mlvm.share.ClassfileGenerator;
 
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenFullCP.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenFullCP.java
index ebad686e24d..ffc68f3d736 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenFullCP.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenFullCP.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, 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,12 +23,12 @@
 
 package vm.mlvm.cp.share;
 
-import jdk.internal.org.objectweb.asm.ByteVector;
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.ClassWriterExt;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.Type;
+import org.objectweb.asm.ByteVector;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.ClassWriterExt;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
 
 import vm.mlvm.share.ClassfileGenerator;
 import vm.mlvm.share.Env;
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenManyIndyCorrectBootstrap.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenManyIndyCorrectBootstrap.java
index e3c9990cbcb..7d9cf1d1f39 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenManyIndyCorrectBootstrap.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenManyIndyCorrectBootstrap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, 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,12 +23,12 @@
 
 package vm.mlvm.cp.share;
 
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.ClassWriterExt;
-import jdk.internal.org.objectweb.asm.Handle;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.Type;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.ClassWriterExt;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
 
 import vm.mlvm.share.ClassfileGenerator;
 import vm.mlvm.share.Env;
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenManyIndyIncorrectBootstrap.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenManyIndyIncorrectBootstrap.java
index daf595c8080..a72b88e89ee 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenManyIndyIncorrectBootstrap.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenManyIndyIncorrectBootstrap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, 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 @@
 
 package vm.mlvm.cp.share;
 
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.ClassWriterExt;
-import jdk.internal.org.objectweb.asm.Handle;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.Type;
-import jdk.internal.org.objectweb.asm.Label;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.ClassWriterExt;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.Label;
 
 import vm.mlvm.share.ClassfileGenerator;
 import vm.mlvm.share.Env;
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenManyIndyOneCPX.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenManyIndyOneCPX.java
index fd5b5b549e3..5d4e1103574 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenManyIndyOneCPX.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/GenManyIndyOneCPX.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, 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,10 +23,10 @@
 
 package vm.mlvm.cp.share;
 
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.Handle;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Handle;
 
 import vm.mlvm.share.ClassfileGenerator;
 
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/HandleType.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/HandleType.java
index aad3a125dbd..b2a5cb4aa9d 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/HandleType.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/share/HandleType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, 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 vm.mlvm.cp.share;
 
-import jdk.internal.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Opcodes;
 
 public enum HandleType {
     GETFIELD(Opcodes.H_GETFIELD),
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/correctBootstrap/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/correctBootstrap/TestDescription.java
index f04b686c3e1..af209792813 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/correctBootstrap/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/correctBootstrap/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, 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,6 @@
 
 /*
  * @test
- * @modules java.base/jdk.internal.org.objectweb.asm
  *
  * @summary converted from VM Testbase vm/mlvm/cp/stress/classfmt/correctBootstrap.
  * VM Testbase keywords: [feature_mlvm]
@@ -34,6 +33,7 @@
  *     invokedynamic commands that refer to correct bootstrap method types. Verify that bootstrap/target
  *     methods are invoked. The maximum number of invokedynamic calls is determined dynamically.
  *
+ * @library /testlibrary/asm
  * @library /vmTestbase
  *          /test/lib
  *          /vmTestbase/vm/mlvm/patches
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/incorrectBootstrap/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/incorrectBootstrap/TestDescription.java
index 645837efa33..79a4a05aab4 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/incorrectBootstrap/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/incorrectBootstrap/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, 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,6 @@
 
 /*
  * @test
- * @modules java.base/jdk.internal.org.objectweb.asm
  *
  * @summary converted from VM Testbase vm/mlvm/cp/stress/classfmt/incorrectBootstrap.
  * VM Testbase keywords: [feature_mlvm]
@@ -35,6 +34,7 @@
  *     exception is thrown for each invokedynamic command and bootstrap/target methods are never invoked.
  *     The maximum number of invokedynamic calls is determined dynamically.
  *
+ * @library /testlibrary/asm
  * @library /vmTestbase
  *          /test/lib
  *          /vmTestbase/vm/mlvm/patches
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/manyIndyOneCPX/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/manyIndyOneCPX/TestDescription.java
index 84338ceca2d..703c739dd5d 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/manyIndyOneCPX/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/manyIndyOneCPX/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, 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,6 @@
 
 /*
  * @test
- * @modules java.base/jdk.internal.org.objectweb.asm
  *
  * @summary converted from VM Testbase vm/mlvm/cp/stress/classfmt/manyIndyOneCPX.
  * VM Testbase keywords: [feature_mlvm, hangup, nonconcurrent, exclude]
@@ -34,6 +33,7 @@
  *        The test creates and executes a class containing lot of invokedynamic instructions
  *        pointing to just one constant pool CONSTANT_InvokeDynamic entry.
  *
+ * @library /testlibrary/asm
  * @library /vmTestbase
  *          /test/lib
  *          /vmTestbase/vm/mlvm/patches
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/mh/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/mh/TestDescription.java
index 9183cf4255b..6b0f45ee533 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/mh/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/mh/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, 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,6 @@
 
 /*
  * @test
- * @modules java.base/jdk.internal.org.objectweb.asm
  *
  * @summary converted from VM Testbase vm/mlvm/cp/stress/classfmt/mh.
  * VM Testbase keywords: [feature_mlvm, nonconcurrent]
@@ -34,6 +33,7 @@
  *     ldc commands. Verify that the class is loaded without errors.
  *     The maximum is determined dynamically.
  *
+ * @library /testlibrary/asm
  * @library /vmTestbase
  *          /test/lib
  *          /vmTestbase/vm/mlvm/patches
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/mt/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/mt/TestDescription.java
index 4589c524f7f..84c43a74516 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/mt/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/cp/stress/classfmt/mt/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, 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,6 @@
 
 /*
  * @test
- * @modules java.base/jdk.internal.org.objectweb.asm
  *
  * @summary converted from VM Testbase vm/mlvm/cp/stress/classfmt/mt.
  * VM Testbase keywords: [feature_mlvm, nonconcurrent]
@@ -34,6 +33,7 @@
  *     ldc commands. Verify that the class is loaded without errors.
  *     The maximum is determined dynamically.
  *
+ * @library /testlibrary/asm
  * @library /vmTestbase
  *          /test/lib
  *          /vmTestbase/vm/mlvm/patches
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/regression/b7127687/Test.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/regression/b7127687/Test.java
index 36b0cb343cc..1e39d3aa123 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/regression/b7127687/Test.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/regression/b7127687/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, 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,8 +33,8 @@ import java.lang.invoke.MethodType;
 import java.util.List;
 import java.util.ArrayList;
 
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
+import org.objectweb.asm.ClassWriter;
+import static org.objectweb.asm.Opcodes.*;
 
 public class Test extends MlvmTest {
 
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/regression/b7127687/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/regression/b7127687/TestDescription.java
index a6acfcd2100..b0a97b1fc54 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/regression/b7127687/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/regression/b7127687/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, 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,7 +25,6 @@
 /*
  * @test
  * @bug 7127687
- * @modules java.base/jdk.internal.org.objectweb.asm
  *
  * @summary converted from VM Testbase vm/mlvm/meth/func/regression/b7127687.
  * VM Testbase keywords: [feature_mlvm, nonconcurrent]
@@ -37,6 +36,7 @@
  *     So previous implementation of MethodType.methodType() throws OOM exception
  *     in this test case.
  *
+ * @library /testlibrary/asm
  * @library /vmTestbase
  *          /test/lib
  *
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/gc/createLotsOfMHConsts/Test.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/gc/createLotsOfMHConsts/Test.java
index f1b3850cfc4..8202271fe8d 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/gc/createLotsOfMHConsts/Test.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/gc/createLotsOfMHConsts/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, 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,6 @@
 
 /*
  * @test
- * @modules java.base/jdk.internal.org.objectweb.asm
  *
  * @summary converted from VM Testbase vm/mlvm/meth/stress/gc/createLotsOfMHConsts.
  * VM Testbase keywords: [feature_mlvm, nonconcurrent]
@@ -34,6 +33,7 @@
  *     using different classloaders) to see if they are garbage collected and don't overflow
  *     different generations of heap.
  *
+ * @library /testlibrary/asm
  * @library /vmTestbase
  *          /test/lib
  *          /vmTestbase/vm/mlvm/patches
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/patches/java.base/jdk/internal/org/objectweb/asm/ClassWriterExt.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/patches/java.base/jdk/internal/org/objectweb/asm/ClassWriterExt.java
index 0f2c5380040..c03884ab213 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/patches/java.base/jdk/internal/org/objectweb/asm/ClassWriterExt.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/patches/java.base/jdk/internal/org/objectweb/asm/ClassWriterExt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package jdk.internal.org.objectweb.asm;
+package org.objectweb.asm;
 
 import java.lang.reflect.InaccessibleObjectException;
 
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/AccessibilityFlagsTest.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/AccessibilityFlagsTest.java
index 10fc5151794..88919bef60f 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/AccessibilityFlagsTest.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/AccessibilityFlagsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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 @@
 /*
  * @test
  *
- * @modules java.base/jdk.internal.org.objectweb.asm:+open java.base/jdk.internal.org.objectweb.asm.util:+open
+ * @library /testlibrary/asm
  * @library /vmTestbase /test/lib
  *
  * @comment build retransform.jar in current dir
@@ -45,7 +45,7 @@ import vm.runtime.defmeth.shared.data.*;
 import vm.runtime.defmeth.shared.data.method.body.EmptyBody;
 import vm.runtime.defmeth.shared.builder.TestBuilder;
 
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
 import static vm.runtime.defmeth.shared.ExecutionMode.*;
 
 /*
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/BasicTest.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/BasicTest.java
index 7d664b35ef8..a92be0f17da 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/BasicTest.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/BasicTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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 @@
 /*
  * @test
  *
- * @modules java.base/jdk.internal.org.objectweb.asm:+open java.base/jdk.internal.org.objectweb.asm.util:+open
+ * @library /testlibrary/asm
  * @library /vmTestbase /test/lib
  *
  * @comment build retransform.jar in current dir
@@ -50,7 +50,7 @@ import vm.runtime.defmeth.shared.data.*;
 import vm.runtime.defmeth.shared.DefMethTest;
 import vm.runtime.defmeth.shared.executor.TestExecutor;
 
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
 import static vm.runtime.defmeth.shared.ExecutionMode.*;
 
 /**
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/ConflictingDefaultsTest.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/ConflictingDefaultsTest.java
index 1137094d801..c5de16d583e 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/ConflictingDefaultsTest.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/ConflictingDefaultsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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 @@
 /*
  * @test
  *
- * @modules java.base/jdk.internal.org.objectweb.asm:+open java.base/jdk.internal.org.objectweb.asm.util:+open
+ * @library /testlibrary/asm
  * @library /vmTestbase /test/lib
  *
  * @comment build retransform.jar in current dir
@@ -45,7 +45,7 @@ import vm.runtime.defmeth.shared.annotation.NotApplicableFor;
 import vm.runtime.defmeth.shared.builder.TestBuilder;
 import vm.runtime.defmeth.shared.data.*;
 
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SYNCHRONIZED;
+import static org.objectweb.asm.Opcodes.ACC_SYNCHRONIZED;
 import static vm.runtime.defmeth.shared.data.method.body.CallMethod.Invoke.*;
 import static vm.runtime.defmeth.shared.data.method.body.CallMethod.IndexbyteOp.*;
 import static vm.runtime.defmeth.shared.ExecutionMode.*;
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/DefaultVsAbstractTest.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/DefaultVsAbstractTest.java
index 115b4c8385d..ba7f8489ac1 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/DefaultVsAbstractTest.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/DefaultVsAbstractTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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 @@
 /*
  * @test
  *
- * @modules java.base/jdk.internal.org.objectweb.asm:+open java.base/jdk.internal.org.objectweb.asm.util:+open
+ * @library /testlibrary/asm
  * @library /vmTestbase /test/lib
  *
  * @comment build retransform.jar in current dir
@@ -44,7 +44,7 @@ import vm.runtime.defmeth.shared.DefMethTest;
 import vm.runtime.defmeth.shared.data.*;
 import vm.runtime.defmeth.shared.builder.TestBuilder;
 
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SYNCHRONIZED;
+import static org.objectweb.asm.Opcodes.ACC_SYNCHRONIZED;
 import static vm.runtime.defmeth.shared.ExecutionMode.*;
 
 /**
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/MethodResolutionTest.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/MethodResolutionTest.java
index 632643178d9..85511b0d499 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/MethodResolutionTest.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/MethodResolutionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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 @@
 /*
  * @test
  *
- * @modules java.base/jdk.internal.org.objectweb.asm:+open java.base/jdk.internal.org.objectweb.asm.util:+open
+ * @library /testlibrary/asm
  * @library /vmTestbase /test/lib
  *
  * @comment build retransform.jar in current dir
@@ -45,7 +45,7 @@ import vm.runtime.defmeth.shared.data.method.param.*;
 import vm.runtime.defmeth.shared.DefMethTest;
 import vm.runtime.defmeth.shared.builder.TestBuilder;
 
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
 import static vm.runtime.defmeth.shared.ExecutionMode.*;
 
 /**
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/ObjectMethodOverridesTest.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/ObjectMethodOverridesTest.java
index b8d761d38e6..cf047a00c8f 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/ObjectMethodOverridesTest.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/ObjectMethodOverridesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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 @@
 /*
  * @test
  *
- * @modules java.base/jdk.internal.org.objectweb.asm:+open java.base/jdk.internal.org.objectweb.asm.util:+open
+ * @library /testlibrary/asm
  * @library /vmTestbase /test/lib
  *
  * @comment build retransform.jar in current dir
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/PrivateMethodsTest.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/PrivateMethodsTest.java
index 301dd6114ef..8f204cc13cd 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/PrivateMethodsTest.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/PrivateMethodsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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 @@
 /*
  * @test
  *
- * @modules java.base/jdk.internal.org.objectweb.asm:+open java.base/jdk.internal.org.objectweb.asm.util:+open
+ * @library /testlibrary/asm
  * @library /vmTestbase /test/lib
  *
  * @comment build retransform.jar in current dir
@@ -45,7 +45,7 @@ import vm.runtime.defmeth.shared.annotation.NotApplicableFor;
 import vm.runtime.defmeth.shared.builder.TestBuilder;
 import vm.runtime.defmeth.shared.data.*;
 
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SYNCHRONIZED;
+import static org.objectweb.asm.Opcodes.ACC_SYNCHRONIZED;
 import static vm.runtime.defmeth.shared.data.method.body.CallMethod.Invoke.*;
 import static vm.runtime.defmeth.shared.data.method.body.CallMethod.IndexbyteOp.*;
 import static vm.runtime.defmeth.shared.ExecutionMode.*;
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/RedefineTest.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/RedefineTest.java
index fcd9f96e092..73509a4c8ea 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/RedefineTest.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/RedefineTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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 @@
 /*
  * @test
  *
- * @modules java.base/jdk.internal.org.objectweb.asm:+open java.base/jdk.internal.org.objectweb.asm.util:+open
+ * @library /testlibrary/asm
  * @library /vmTestbase /test/lib
  *
  * @comment build retransform.jar in current dir
@@ -55,7 +55,7 @@ import vm.runtime.defmeth.shared.data.ConcreteClass;
 import vm.runtime.defmeth.shared.data.Interface;
 import vm.runtime.defmeth.shared.data.Tester;
 
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
 import static vm.runtime.defmeth.shared.ExecutionMode.*;
 
 /*
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/StaticMethodsTest.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/StaticMethodsTest.java
index 3bcd0b62f5d..1b471c45acd 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/StaticMethodsTest.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/StaticMethodsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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 @@
 /*
  * @test
  *
- * @modules java.base/jdk.internal.org.objectweb.asm:+open java.base/jdk.internal.org.objectweb.asm.util:+open
+ * @library /testlibrary/asm
  * @library /vmTestbase /test/lib
  *
  * @comment build retransform.jar in current dir
@@ -45,7 +45,7 @@ import vm.runtime.defmeth.shared.data.*;
 import vm.runtime.defmeth.shared.builder.TestBuilder;
 import vm.runtime.defmeth.shared.annotation.NotApplicableFor;
 
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
 import static vm.runtime.defmeth.shared.data.method.body.CallMethod.Invoke.*;
 import static vm.runtime.defmeth.shared.data.method.body.CallMethod.IndexbyteOp.*;
 import static vm.runtime.defmeth.shared.ExecutionMode.*;
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/StressTest.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/StressTest.java
index 40fd0500816..e8fe73cb48b 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/StressTest.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/StressTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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 @@
 /*
  * @test
  *
- * @modules java.base/jdk.internal.org.objectweb.asm:+open java.base/jdk.internal.org.objectweb.asm.util:+open
+ * @library /testlibrary/asm
  * @library /vmTestbase /test/lib
  *
  * @comment build retransform.jar in current dir
@@ -55,7 +55,7 @@ import vm.share.options.OptionSupport;
 import vm.share.options.Options;
 import jdk.test.lib.Utils;
 
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
 import static vm.runtime.defmeth.shared.DefMethTest.MAX_MAJOR_VER;
 import static vm.runtime.defmeth.shared.DefMethTest.MIN_MAJOR_VER;
 
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/SuperCallTest.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/SuperCallTest.java
index 1ae2531810f..48a9c705420 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/SuperCallTest.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/SuperCallTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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 @@
 /*
  * @test
  *
- * @modules java.base/jdk.internal.org.objectweb.asm:+open java.base/jdk.internal.org.objectweb.asm.util:+open
+ * @library /testlibrary/asm
  * @library /vmTestbase /test/lib
  *
  * @comment build retransform.jar in current dir
@@ -45,7 +45,7 @@ import vm.runtime.defmeth.shared.annotation.NotApplicableFor;
 import vm.runtime.defmeth.shared.data.*;
 import vm.runtime.defmeth.shared.builder.TestBuilder;
 
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SYNCHRONIZED;
+import static org.objectweb.asm.Opcodes.ACC_SYNCHRONIZED;
 import static vm.runtime.defmeth.shared.ExecutionMode.*;
 
 /*
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/ClassFileGenerator.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/ClassFileGenerator.java
index 7722cbc0675..f1ce9325bf5 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/ClassFileGenerator.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/ClassFileGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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,17 +24,17 @@
 package vm.runtime.defmeth.shared;
 
 
-import jdk.internal.org.objectweb.asm.Handle;
-import jdk.internal.org.objectweb.asm.Type;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Type;
 import nsk.share.TestFailure;
 import nsk.share.test.TestUtils;
-import jdk.internal.org.objectweb.asm.Label;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
 
 import static java.lang.invoke.MethodHandleInfo.REF_newInvokeSpecial;
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import static jdk.internal.org.objectweb.asm.ClassWriter.*;
+import static org.objectweb.asm.Opcodes.*;
+import org.objectweb.asm.ClassWriter;
+import static org.objectweb.asm.ClassWriter.*;
 
 import vm.runtime.defmeth.shared.data.*;
 import vm.runtime.defmeth.shared.data.method.*;
@@ -504,11 +504,11 @@ public class ClassFileGenerator implements Visitor {
         //   cw = new ClassWriter(COMPUTE_FRAMES | COMPUTE_MAXS);
         // then:
         // java.lang.RuntimeException: java.lang.ClassNotFoundException: S
-        //   at jdk.internal.org.objectweb.asm.ClassWriter.getCommonSuperClass(ClassWriter.java:1588)
-        //   at jdk.internal.org.objectweb.asm.ClassWriter.getMergedType(ClassWriter.java:1559)
-        //   at jdk.internal.org.objectweb.asm.Frame.merge(Frame.java:1407)
-        //   at jdk.internal.org.objectweb.asm.Frame.merge(Frame.java:1308)
-        //   at jdk.internal.org.objectweb.asm.MethodWriter.visitMaxs(MethodWriter.java:1353)
+        //   at org.objectweb.asm.ClassWriter.getCommonSuperClass(ClassWriter.java:1588)
+        //   at org.objectweb.asm.ClassWriter.getMergedType(ClassWriter.java:1559)
+        //   at org.objectweb.asm.Frame.merge(Frame.java:1407)
+        //   at org.objectweb.asm.Frame.merge(Frame.java:1308)
+        //   at org.objectweb.asm.MethodWriter.visitMaxs(MethodWriter.java:1353)
         //mv.visitMaxs(t.getParams().length > 1 ? t.getParams().length+1 : 2, 2);
 
         cw = new ClassWriter(COMPUTE_MAXS);
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/DefMethTest.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/DefMethTest.java
index b3916a4f801..0f595cdaa09 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/DefMethTest.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/DefMethTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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
@@ -48,8 +48,8 @@ import vm.share.options.Option;
 import vm.share.options.OptionSupport;
 import vm.share.options.Options;
 import static java.lang.String.format;
-import static jdk.internal.org.objectweb.asm.Opcodes.V17;
-import static jdk.internal.org.objectweb.asm.Opcodes.V1_5;
+import static org.objectweb.asm.Opcodes.V17;
+import static org.objectweb.asm.Opcodes.V1_5;
 
 import vm.runtime.defmeth.RedefineTest;
 
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/Printer.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/Printer.java
index 07a5fc56c18..e6765aa6ded 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/Printer.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/Printer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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,7 +25,7 @@ package vm.runtime.defmeth.shared;
 
 import java.util.List;
 import java.util.ArrayList;
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
 
 import vm.runtime.defmeth.shared.data.*;
 import vm.runtime.defmeth.shared.data.method.*;
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/Util.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/Util.java
index ce38ff456ce..b0bcd71d0ef 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/Util.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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,14 +132,14 @@ public class Util {
      * @param classFile
      */
     public static void printClassFile(byte[] classFile) {
-        int flags =  jdk.internal.org.objectweb.asm.ClassReader.SKIP_DEBUG;
+        int flags = org.objectweb.asm.ClassReader.SKIP_DEBUG;
 
         classFile = classFile.clone();
 
-        jdk.internal.org.objectweb.asm.ClassReader cr =
-                new  jdk.internal.org.objectweb.asm.ClassReader(classFile);
+        org.objectweb.asm.ClassReader cr =
+                new  org.objectweb.asm.ClassReader(classFile);
 
-        cr.accept(new  jdk.internal.org.objectweb.asm.util.TraceClassVisitor(new PrintWriter(System.out)), flags);
+        cr.accept(new  org.objectweb.asm.util.TraceClassVisitor(new PrintWriter(System.out)), flags);
     }
 
     /**
@@ -149,14 +149,14 @@ public class Util {
      * @param classFile
      */
     public static void asmifyClassFile(byte[] classFile) {
-        int flags =  jdk.internal.org.objectweb.asm.ClassReader.SKIP_DEBUG;
+        int flags =  org.objectweb.asm.ClassReader.SKIP_DEBUG;
 
-        jdk.internal.org.objectweb.asm.ClassReader cr =
-                new  jdk.internal.org.objectweb.asm.ClassReader(classFile);
+        org.objectweb.asm.ClassReader cr =
+                new  org.objectweb.asm.ClassReader(classFile);
 
         //cr.accept(new TraceClassVisitor(new PrintWriter(System.out)), flags);
-        cr.accept(new jdk.internal.org.objectweb.asm.util.TraceClassVisitor(null,
-                        new jdk.internal.org.objectweb.asm.util.ASMifier(),
+        cr.accept(new org.objectweb.asm.util.TraceClassVisitor(null,
+                        new org.objectweb.asm.util.ASMifier(),
                         new PrintWriter(System.out)), flags);
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/AccessFlag.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/AccessFlag.java
index aa270a99578..a60278f447e 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/AccessFlag.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/AccessFlag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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 vm.runtime.defmeth.shared.builder;
 
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
 
 /**
  * Access flags, related to element visibility (public, private, etc).
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/ClassBuilder.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/ClassBuilder.java
index a430e2cc6e1..9e367546135 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/ClassBuilder.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/ClassBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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 vm.runtime.defmeth.shared.builder;
 import java.util.ArrayList;
 import java.util.List;
 import vm.runtime.defmeth.shared.data.method.Method;
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
 
 /**
  * Generic builder for classes of type {@code } using
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/ConcreteClassBuilder.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/ConcreteClassBuilder.java
index 2be58e665ff..dacbcedb34a 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/ConcreteClassBuilder.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/ConcreteClassBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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,7 @@ import vm.runtime.defmeth.shared.data.ConcreteClass;
 import vm.runtime.defmeth.shared.data.Interface;
 import vm.runtime.defmeth.shared.data.method.Method;
 
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
 import vm.runtime.defmeth.shared.data.ConcreteClassImpl;
 
 /**
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/MethodBuilder.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/MethodBuilder.java
index 6f7bf68d09e..5740e7b8778 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/MethodBuilder.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/MethodBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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,7 @@ import vm.runtime.defmeth.shared.data.method.body.ReturnNewInstanceBody;
 import vm.runtime.defmeth.shared.data.method.body.ReturnNullBody;
 import vm.runtime.defmeth.shared.data.method.body.ThrowExBody;
 import vm.runtime.defmeth.shared.data.method.param.Param;
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
 import vm.runtime.defmeth.shared.data.ConcreteClass;
 
 /**
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/TestBuilder.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/TestBuilder.java
index f9493cc2f7a..80911b0f576 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/TestBuilder.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/TestBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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
@@ -29,7 +29,7 @@ import java.util.*;
 
 import nsk.share.Pair;
 
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
 
 import nsk.share.TestFailure;
 import vm.runtime.defmeth.shared.ClassFileGenerator;
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/TesterBuilder.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/TesterBuilder.java
index 3ffac995a84..ad1dbc55da9 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/TesterBuilder.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/builder/TesterBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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 vm.runtime.defmeth.shared.builder;
 
 import nsk.share.Pair;
-import jdk.internal.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Opcodes;
 import vm.runtime.defmeth.shared.Util;
 import vm.runtime.defmeth.shared.data.Clazz;
 import vm.runtime.defmeth.shared.data.ConcreteClass;
@@ -37,7 +37,7 @@ import vm.runtime.defmeth.shared.data.method.result.IntResult;
 import vm.runtime.defmeth.shared.data.method.result.Result;
 import vm.runtime.defmeth.shared.data.method.result.ResultIgnore;
 import vm.runtime.defmeth.shared.data.method.result.ThrowExResult;
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
 import vm.runtime.defmeth.shared.data.Interface;
 import vm.runtime.defmeth.shared.data.method.body.CallMethod;
 import vm.runtime.defmeth.shared.data.method.body.CallMethod.Invoke;
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/ConcreteClass.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/ConcreteClass.java
index 8ec038102dc..6a3eba44dc6 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/ConcreteClass.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/ConcreteClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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 vm.runtime.defmeth.shared.data;
 
-import jdk.internal.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Opcodes;
 import vm.runtime.defmeth.shared.data.method.Method;
 
 /**
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/method/AbstractMethod.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/method/AbstractMethod.java
index 0d647f1f321..9c429d4375e 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/method/AbstractMethod.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/method/AbstractMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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 vm.runtime.defmeth.shared.data.method;
 
-import jdk.internal.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Opcodes;
 import vm.runtime.defmeth.shared.Printer;
 import vm.runtime.defmeth.shared.data.Visitor;
 
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/method/ConcreteMethod.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/method/ConcreteMethod.java
index 712c56fa4de..deb608bb9fd 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/method/ConcreteMethod.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/method/ConcreteMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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,7 +25,7 @@ package vm.runtime.defmeth.shared.data.method;
 
 import vm.runtime.defmeth.shared.Printer;
 import vm.runtime.defmeth.shared.data.method.body.MethodBody;
-import jdk.internal.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Opcodes;
 import vm.runtime.defmeth.shared.data.Visitor;
 
 /**
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/method/DefaultMethod.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/method/DefaultMethod.java
index 5e6b27ef426..62bd18f0cfa 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/method/DefaultMethod.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/method/DefaultMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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,7 +25,7 @@ package vm.runtime.defmeth.shared.data.method;
 
 import vm.runtime.defmeth.shared.Printer;
 import vm.runtime.defmeth.shared.data.method.body.MethodBody;
-import jdk.internal.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Opcodes;
 import vm.runtime.defmeth.shared.data.Visitor;
 
 /**
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/method/body/CallMethod.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/method/body/CallMethod.java
index eb86cb52b1d..329398cc0d9 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/method/body/CallMethod.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/data/method/body/CallMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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 vm.runtime.defmeth.shared.data.method.body;
 
 import vm.runtime.defmeth.shared.data.method.param.Param;
-import jdk.internal.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Opcodes;
 import vm.runtime.defmeth.shared.data.Visitor;
 import vm.runtime.defmeth.shared.data.Clazz;
 import vm.runtime.defmeth.shared.data.Interface;
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/executor/ReflectionTest.java b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/executor/ReflectionTest.java
index ac7345e1df9..45c11cf9faa 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/executor/ReflectionTest.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/executor/ReflectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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
@@ -43,7 +43,7 @@ import vm.runtime.defmeth.shared.data.method.body.ReturnIntBody;
 import vm.runtime.defmeth.shared.data.method.body.ThrowExBody;
 import vm.runtime.defmeth.shared.data.method.result.IntResult;
 import vm.runtime.defmeth.shared.data.method.result.ThrowExResult;
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.*;
 
 import java.lang.reflect.*;
 import java.util.Arrays;
diff --git a/test/jdk/com/sun/jdi/ClassUnloadEventTest.java b/test/jdk/com/sun/jdi/ClassUnloadEventTest.java
index 41b1bff5e42..0948f2cc994 100644
--- a/test/jdk/com/sun/jdi/ClassUnloadEventTest.java
+++ b/test/jdk/com/sun/jdi/ClassUnloadEventTest.java
@@ -202,7 +202,7 @@ public class ClassUnloadEventTest {
         LaunchingConnector launchingConnector = Bootstrap.virtualMachineManager().defaultConnector();
         Map arguments = launchingConnector.defaultArguments();
         arguments.get("main").setValue(ClassUnloadEventTest.class.getName());
-        arguments.get("options").setValue("--add-exports java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xlog:class+unload=info -Xlog:gc");
+        arguments.get("options").setValue("-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xlog:class+unload=info -Xlog:gc");
         return launchingConnector.launch(arguments);
     }
 }